fix: respect ignore differences for individual array elements in CRDs#28220
Open
nitishfy wants to merge 2 commits into
Open
fix: respect ignore differences for individual array elements in CRDs#28220nitishfy wants to merge 2 commits into
nitishfy wants to merge 2 commits into
Conversation
Signed-off-by: nitishfy <justnitish06@gmail.com>
🔴 Preview Environment stopped on BunnyshellSee: Environment Details | Pipeline Logs Available commands (reply to this comment):
|
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
Bundle ReportBundle size has no change ✅ |
leoluz
reviewed
Jun 10, 2026
| f.comparisonResult.reconciliationResult.Target = []*unstructured.Unstructured{target} | ||
|
|
||
| gvk := schema.GroupVersionKind{Group: "projectcontour.io", Version: "v1", Kind: "HTTPProxy"} | ||
| fmt.Printf("LookupResource result: %+v\n", oapiResources.LookupResource(gvk)) |
Collaborator
There was a problem hiding this comment.
probably needs to be cleaned?
| // Strategic merge patch can fail (and even panic) for resources whose schema | ||
| // has incomplete or nil subschemas for some fields, e.g. CRDs with free-form | ||
| // objects such as the Argo CD Application CRD. This is a known bug in the | ||
| // strategic merge patch handling of k8s.io/apimachinery prior to v0.35 |
Collaborator
There was a problem hiding this comment.
Can we verify this claim? Which bug in apimachinery is this related to exactly? I checked #25199 but it doesn't have anything specifically about the apimachinery bug. Please provide some validation and references.
Member
There was a problem hiding this comment.
It's this one: kubernetes/kubernetes@5af2870
I agree we should verify this; I have created a failing testcase which this PR should pass now. We shouldn't need to do any of this recover stuff
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Revert #25294
Checklist: