fix(kubernetes): Fix merge strategy field (#7455) #7462
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Manual cherry pick of #7455 to 1.15. The only conflict was that #7344 removed
inline={true}on a line adjacent to a changed line; manually resolved this.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.