fix(customresources): use a 3-way merge patch instead of strategic merge #1095
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
CustomResources do not support [JSON strategic merges](https://tools.ietf.org/html/rfc6902) on patch updates. Instead, they require a [JSON 3-way merge patch](https://tools.ietf.org/html/rfc7386) to properly apply the patch. CustomResource kinds now are treated separately from other known k8s kinds in order to apply the proper patch. A new [CoreOS prometheus-operator](https://github.com/coreos/prometheus-operator) test with a step update is included to validate this update path.
metral
force-pushed
the
metral/cr-merge-patch
branch
from
c01bddd to
4147861
Compare
lblackstone
approved these changes
May 5, 2020
Yes, that's right. -- Before the change Initial update with
After the change The
|
1 task
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.
Proposed changes
CustomResources do not support JSON strategic merges on patch updates.
Instead, they require a JSON 3-way merge patch to properly apply the patch.
CustomResource kinds now are treated separately from other known k8s kinds in
order to apply the proper patch.
A new CoreOS prometheus-operator test with a step update is included to validate this update path.
Related issues (optional)
Fixes #1061