Determine patchType based on GVK and generate correct patch #102
Conversation
This file contains hidden or 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
This commit replaces the previous implementation, that would first try a StrategicMergePatch and if that failed fall back to a MergePatch with an implementation that follows the same logic as kubectl. It now determines based on the GVK, if it can create a strategic merge patch. If not, it generates a merge patch. The patch type is further now returned alongside the patch. Making sure we're sending the correct patch with the correct patch type. The previous implementation, incorrectly, did always send a merge patch, even if the type was set to StrategicMergePatchType.
|
In hindsight, it's a surprise this ever worked at all... |
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.
This commit replaces the previous implementation, that would
first try a StrategicMergePatch and if that failed fall back
to a MergePatch with an implementation that follows the same
logic as kubectl.
It now determines based on the GVK, if it can create a strategic
merge patch. If not, it generates a merge patch. The patch
type is further now returned alongside the patch. Making sure
we're sending the correct patch with the correct patch type.
The previous implementation, incorrectly, did always send a merge
patch, even if the type was set to StrategicMergePatchType.