Fix diff logic for CRD kinds with the same name as a built-in #1779
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
The diff logic was incorrectly treating CRD kinds with a name matching a built-in kind as known (e.g., Service). In these cases, the patch behavior was erroneously set to strategic merge rather than JSON merge.
viveklak
approved these changes
Oct 28, 2021
|
@lblackstone thanks for the quick fix! |
Does the PR have any schema changes?Looking good! No breaking changes found. |
2 similar comments
Does the PR have any schema changes?Looking good! No breaking changes found. |
Does the PR have any schema changes?Looking good! No breaking changes found. |
Does the PR have any schema changes?Looking good! No breaking changes found. |
viveklak
reviewed
Oct 29, 2021
| "storage.k8s.io/v1", | ||
| "storage.k8s.io/v1alpha1", | ||
| "storage.k8s.io/v1beta1", | ||
| "v1", // alias for "core/v1" |
There was a problem hiding this comment.
Is there a way to know that we are not missing any other aliases?
There was a problem hiding this comment.
"core/v1" is the only special case I'm aware of, and is a relic from early versions of k8s. Anything else should include a group and a version.
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
The diff logic was incorrectly treating CRD kinds with a name
matching a built-in kind as known (e.g., Service). In these cases,
the patch behavior was erroneously set to strategic merge rather
than JSON merge.
Related issues (optional)
Fix #1774