Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(kubernetes): Fix merge strategy field #7455

Merged
merged 6 commits into from
Sep 27, 2019
Merged

fix(kubernetes): Fix merge strategy field #7455

merged 6 commits into from
Sep 27, 2019

Conversation

ezimanyi
Copy link
Contributor

  • fix(kubernetes): Properly dirty patch stage on resource update

    We're not currently not marking the stage dirty upon chaning the resource to be selected, which makes it impossible to save (without making some other change or waiting for a digest cycle to happen for another reason).

  • fix(kubernetes): Fix manifest source defaulting in patch manifest

    When creating a new patch manifest stage, we default the 'Manifest Source' selector to 'Text' but the 'Manifest' text box is not visible; the user needs to choose 'Artifact' then 'Text' again to make the text box visible.

  • fix(kubernetes): Fix merge strategy field

    We've been incorrectly setting the merge strategy on options.strategy instead of options.mergeStrategy since 1.15. Start writing to the correct field, and handle updating any stages affected by the bug by deleting the value of 'strategy' and copying it over to mergeStrategy.

We're not currently not marking the stage dirty upon chaning the
resource to be selected, which makes it impossible to save (without
making some other change or waiting for a digest cycle to happen
for another reason).
When creating a new patch manifest stage, we default the 'Manifest
Source' selector to 'Text' but the 'Manifest' text box is not visible;
the user needs to choose 'Artifact' then 'Text' again to make the
text box visible.
We've been incorrectly setting the merge strategy on options.strategy
instead of options.mergeStrategy since 1.15. Start writing to the
correct field, and handle updating any stages affected by the bug by
deleting the value of 'strategy' and copying it over to mergeStrategy.
The prior commit was incorrect; delete does not return the deleted
value.
Copy link
Contributor

@maggieneterval maggieneterval left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚒️ 📜 🐛 💯 💯 💯

@ezimanyi ezimanyi merged commit 479e9d6 into spinnaker:master Sep 27, 2019
@ezimanyi ezimanyi deleted the fix-patch-manifest branch September 27, 2019 22:02
@ezimanyi
Copy link
Contributor Author

@spinnakerbot 🍒 ⛏️ 1.16
@spinnakerbot 🍒 ⛏️ 1.15

spinnakerbot pushed a commit that referenced this pull request Sep 27, 2019
* fix(kubernetes): Properly dirty patch stage on resource update

We're not currently not marking the stage dirty upon chaning the
resource to be selected, which makes it impossible to save (without
making some other change or waiting for a digest cycle to happen
for another reason).

* fix(kubernetes): Fix manifest source defaulting in patch manifest

When creating a new patch manifest stage, we default the 'Manifest
Source' selector to 'Text' but the 'Manifest' text box is not visible;
the user needs to choose 'Artifact' then 'Text' again to make the
text box visible.

* fix(kubernetes): Fix merge strategy field

We've been incorrectly setting the merge strategy on options.strategy
instead of options.mergeStrategy since 1.15. Start writing to the
correct field, and handle updating any stages affected by the bug by
deleting the value of 'strategy' and copying it over to mergeStrategy.

* fix(kubernetes): Fix defaulting of strategy field

The prior commit was incorrect; delete does not return the deleted
value.

* fix(kubernetes): Fix display of strategy field
@spinnakerbot
Copy link
Contributor

Cherry pick successful: #7457

@spinnakerbot
Copy link
Contributor

Cherry pick failed: Command failed (cherry pick commit 479e9d6) with exit code 1:

error: could not apply 479e9d6ed... fix(kubernetes): Fix merge strategy field (#7455)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

louisjimenez pushed a commit that referenced this pull request Sep 30, 2019
* fix(kubernetes): Properly dirty patch stage on resource update

We're not currently not marking the stage dirty upon chaning the
resource to be selected, which makes it impossible to save (without
making some other change or waiting for a digest cycle to happen
for another reason).

* fix(kubernetes): Fix manifest source defaulting in patch manifest

When creating a new patch manifest stage, we default the 'Manifest
Source' selector to 'Text' but the 'Manifest' text box is not visible;
the user needs to choose 'Artifact' then 'Text' again to make the
text box visible.

* fix(kubernetes): Fix merge strategy field

We've been incorrectly setting the merge strategy on options.strategy
instead of options.mergeStrategy since 1.15. Start writing to the
correct field, and handle updating any stages affected by the bug by
deleting the value of 'strategy' and copying it over to mergeStrategy.

* fix(kubernetes): Fix defaulting of strategy field

The prior commit was incorrect; delete does not return the deleted
value.

* fix(kubernetes): Fix display of strategy field
louisjimenez pushed a commit that referenced this pull request Sep 30, 2019
* fix(kubernetes): Properly dirty patch stage on resource update

We're not currently not marking the stage dirty upon chaning the
resource to be selected, which makes it impossible to save (without
making some other change or waiting for a digest cycle to happen
for another reason).

* fix(kubernetes): Fix manifest source defaulting in patch manifest

When creating a new patch manifest stage, we default the 'Manifest
Source' selector to 'Text' but the 'Manifest' text box is not visible;
the user needs to choose 'Artifact' then 'Text' again to make the
text box visible.

* fix(kubernetes): Fix merge strategy field

We've been incorrectly setting the merge strategy on options.strategy
instead of options.mergeStrategy since 1.15. Start writing to the
correct field, and handle updating any stages affected by the bug by
deleting the value of 'strategy' and copying it over to mergeStrategy.

* fix(kubernetes): Fix defaulting of strategy field

The prior commit was incorrect; delete does not return the deleted
value.

* fix(kubernetes): Fix display of strategy field
jervi added a commit to jervi/deck that referenced this pull request Jan 3, 2020
d2838d8 refactor(core): remove unused parameter options from confirmation modal (spinnaker#7716)
6291f85 chore(core): upgrade to latest prettier (spinnaker#7713)
90aa477 refactor(eslint): Fix all 'prefer-const' eslint rule violations
d070bd4 refactor(eslint): Fix all 'one-var' eslint rule violations
1748701 refactor(eslint): Fix all 'no-var' eslint rule violations
9400826 chore(eslint): remove tslint
88b8f4a refactor(angularjs): use ES6 to import angular - migrate from `const angular = require('angular')` to `import * as angular from 'angular'` - Where possible, migrate from `import angular from 'angular'; angular.module('asdf')`   to `import { module } from 'angular'; module('asdf')`
a076dc1 refactor(angularjs): use ES6 imports for angularjs module deps - migrate from `require('@uirouter/angularjs').default` to import UIROUTER_ANGULARJS from '@uirouter/angularjs' - migrate from `require('angular-ui-bootstrap')` to import ANGULAR_UI_BOOTSTRAP from 'angular-ui-bootstrap'
ac1c86e refactor(angularjs): Import angularjs module dependencies by name - Migrate angularjs module dependencies to import the exported string identifier, not via require('module').name
784d64b refactor(angularjs): Always export the ng module name, not the module itself
b6aabe1 chore(typescript): Migrate most wildcard imports to javascript style imports - Migrate from "import * as foo from 'foo'" to "import foo from 'foo'"
7ef58b6 feat(typescript): enable allowJs and allowSyntheticDefaultImports
145f540 chore(typescript): update to typescript 3.7.x (spinnaker#7668)
f0613c1 refactor(*): Remove exports-loader from n3-chart import
9e4e898 fix(kubernetes/serverGroup): Remove unused controller file for 'kubernetesServerGroupLoadBalancersController' (spinnaker#7663)
c233af0 fix(angularJS): Fix all remaining non-strict angularJS DI code via @spinnaker/strictdi linter rule
baf5e31 fix(kubernetes): fix patchBody input in Patch (Manifest) stage (spinnaker#7600)
4ed015a feat(dataSources): widen + parameterize types, add default values
2c100b6 feat(kubernetes): permit multiple ReplicaSets to be deployed with a single rollout strategy config (spinnaker#7574)
03cb78c fix(runJob): fix artifact output creation (spinnaker#7579)
a71f76d fix: credentails typo (spinnaker#7541)
17be6af feat(kubernetes): support rolling restart operation for deployments (spinnaker#7538)
be258cd fix(kubernetes): add missing `app` config param for patch manifest stages (spinnaker#7521)
479e9d6 fix(kubernetes): Fix merge strategy field (spinnaker#7455)
3b880c7 refactor(kubernetes): remove unnecessary angular and non-typescript deps (spinnaker#7454)
e667bdf refactor(kubernetes): isolate v1 code (spinnaker#7451)
1083a70 fix(kubernetes): remove former 24-char limit on services names (spinnaker#7389)
8bdca89  fix(core): fix vertical alignment of radio buttons (spinnaker#7344)
413a3de feat(kubernetes): permit creatable options for service and namespace in rollout strategy config (spinnaker#7320)
0b1ce1e feat(provider/k8s): support artifacts in run job (spinnaker#7309)
maggieneterval pushed a commit that referenced this pull request Jan 3, 2020
d2838d8 refactor(core): remove unused parameter options from confirmation modal (#7716)
6291f85 chore(core): upgrade to latest prettier (#7713)
90aa477 refactor(eslint): Fix all 'prefer-const' eslint rule violations
d070bd4 refactor(eslint): Fix all 'one-var' eslint rule violations
1748701 refactor(eslint): Fix all 'no-var' eslint rule violations
9400826 chore(eslint): remove tslint
88b8f4a refactor(angularjs): use ES6 to import angular - migrate from `const angular = require('angular')` to `import * as angular from 'angular'` - Where possible, migrate from `import angular from 'angular'; angular.module('asdf')`   to `import { module } from 'angular'; module('asdf')`
a076dc1 refactor(angularjs): use ES6 imports for angularjs module deps - migrate from `require('@uirouter/angularjs').default` to import UIROUTER_ANGULARJS from '@uirouter/angularjs' - migrate from `require('angular-ui-bootstrap')` to import ANGULAR_UI_BOOTSTRAP from 'angular-ui-bootstrap'
ac1c86e refactor(angularjs): Import angularjs module dependencies by name - Migrate angularjs module dependencies to import the exported string identifier, not via require('module').name
784d64b refactor(angularjs): Always export the ng module name, not the module itself
b6aabe1 chore(typescript): Migrate most wildcard imports to javascript style imports - Migrate from "import * as foo from 'foo'" to "import foo from 'foo'"
7ef58b6 feat(typescript): enable allowJs and allowSyntheticDefaultImports
145f540 chore(typescript): update to typescript 3.7.x (#7668)
f0613c1 refactor(*): Remove exports-loader from n3-chart import
9e4e898 fix(kubernetes/serverGroup): Remove unused controller file for 'kubernetesServerGroupLoadBalancersController' (#7663)
c233af0 fix(angularJS): Fix all remaining non-strict angularJS DI code via @spinnaker/strictdi linter rule
baf5e31 fix(kubernetes): fix patchBody input in Patch (Manifest) stage (#7600)
4ed015a feat(dataSources): widen + parameterize types, add default values
2c100b6 feat(kubernetes): permit multiple ReplicaSets to be deployed with a single rollout strategy config (#7574)
03cb78c fix(runJob): fix artifact output creation (#7579)
a71f76d fix: credentails typo (#7541)
17be6af feat(kubernetes): support rolling restart operation for deployments (#7538)
be258cd fix(kubernetes): add missing `app` config param for patch manifest stages (#7521)
479e9d6 fix(kubernetes): Fix merge strategy field (#7455)
3b880c7 refactor(kubernetes): remove unnecessary angular and non-typescript deps (#7454)
e667bdf refactor(kubernetes): isolate v1 code (#7451)
1083a70 fix(kubernetes): remove former 24-char limit on services names (#7389)
8bdca89  fix(core): fix vertical alignment of radio buttons (#7344)
413a3de feat(kubernetes): permit creatable options for service and namespace in rollout strategy config (#7320)
0b1ce1e feat(provider/k8s): support artifacts in run job (#7309)
yunzhangit pushed a commit to yunzhangit/deck that referenced this pull request Mar 28, 2021
* fix(kubernetes): Properly dirty patch stage on resource update

We're not currently not marking the stage dirty upon chaning the
resource to be selected, which makes it impossible to save (without
making some other change or waiting for a digest cycle to happen
for another reason).

* fix(kubernetes): Fix manifest source defaulting in patch manifest

When creating a new patch manifest stage, we default the 'Manifest
Source' selector to 'Text' but the 'Manifest' text box is not visible;
the user needs to choose 'Artifact' then 'Text' again to make the
text box visible.

* fix(kubernetes): Fix merge strategy field

We've been incorrectly setting the merge strategy on options.strategy
instead of options.mergeStrategy since 1.15. Start writing to the
correct field, and handle updating any stages affected by the bug by
deleting the value of 'strategy' and copying it over to mergeStrategy.

* fix(kubernetes): Fix defaulting of strategy field

The prior commit was incorrect; delete does not return the deleted
value.

* fix(kubernetes): Fix display of strategy field
yunzhangit pushed a commit to yunzhangit/deck that referenced this pull request Mar 28, 2021
d2838d8 refactor(core): remove unused parameter options from confirmation modal (spinnaker#7716)
6291f85 chore(core): upgrade to latest prettier (spinnaker#7713)
90aa477 refactor(eslint): Fix all 'prefer-const' eslint rule violations
d070bd4 refactor(eslint): Fix all 'one-var' eslint rule violations
1748701 refactor(eslint): Fix all 'no-var' eslint rule violations
9400826 chore(eslint): remove tslint
88b8f4a refactor(angularjs): use ES6 to import angular - migrate from `const angular = require('angular')` to `import * as angular from 'angular'` - Where possible, migrate from `import angular from 'angular'; angular.module('asdf')`   to `import { module } from 'angular'; module('asdf')`
a076dc1 refactor(angularjs): use ES6 imports for angularjs module deps - migrate from `require('@uirouter/angularjs').default` to import UIROUTER_ANGULARJS from '@uirouter/angularjs' - migrate from `require('angular-ui-bootstrap')` to import ANGULAR_UI_BOOTSTRAP from 'angular-ui-bootstrap'
ac1c86e refactor(angularjs): Import angularjs module dependencies by name - Migrate angularjs module dependencies to import the exported string identifier, not via require('module').name
784d64b refactor(angularjs): Always export the ng module name, not the module itself
b6aabe1 chore(typescript): Migrate most wildcard imports to javascript style imports - Migrate from "import * as foo from 'foo'" to "import foo from 'foo'"
7ef58b6 feat(typescript): enable allowJs and allowSyntheticDefaultImports
145f540 chore(typescript): update to typescript 3.7.x (spinnaker#7668)
f0613c1 refactor(*): Remove exports-loader from n3-chart import
9e4e898 fix(kubernetes/serverGroup): Remove unused controller file for 'kubernetesServerGroupLoadBalancersController' (spinnaker#7663)
c233af0 fix(angularJS): Fix all remaining non-strict angularJS DI code via @spinnaker/strictdi linter rule
baf5e31 fix(kubernetes): fix patchBody input in Patch (Manifest) stage (spinnaker#7600)
4ed015a feat(dataSources): widen + parameterize types, add default values
2c100b6 feat(kubernetes): permit multiple ReplicaSets to be deployed with a single rollout strategy config (spinnaker#7574)
03cb78c fix(runJob): fix artifact output creation (spinnaker#7579)
a71f76d fix: credentails typo (spinnaker#7541)
17be6af feat(kubernetes): support rolling restart operation for deployments (spinnaker#7538)
be258cd fix(kubernetes): add missing `app` config param for patch manifest stages (spinnaker#7521)
479e9d6 fix(kubernetes): Fix merge strategy field (spinnaker#7455)
3b880c7 refactor(kubernetes): remove unnecessary angular and non-typescript deps (spinnaker#7454)
e667bdf refactor(kubernetes): isolate v1 code (spinnaker#7451)
1083a70 fix(kubernetes): remove former 24-char limit on services names (spinnaker#7389)
8bdca89  fix(core): fix vertical alignment of radio buttons (spinnaker#7344)
413a3de feat(kubernetes): permit creatable options for service and namespace in rollout strategy config (spinnaker#7320)
0b1ce1e feat(provider/k8s): support artifacts in run job (spinnaker#7309)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants