Repository navigation
fix: strip fluxcd managed labels - #1065
Merged
Merged
Conversation
Collaborator
|
@jkroepke lint issue. |
Collaborator
|
Error: manifest/util.go:33:1: File is not properly formatted (gci)
Error: issues found |
jkroepke
commented
Sep 8, 2026
Collaborator
|
Error: manifest/util.go:34:1: File is not properly formatted (gci)
Error: issues found |
Contributor
Author
yxxhero
added a commit
that referenced
this pull request
Sep 25, 2026
Resolve conflicts between the three-way merge for unstructured objects (PR #923) and the changes that landed on master since, most notably: - #1063 restructured createPatch to return a *resourcePatch and moved patch application into applyPatch with the client-side fallback. The three-way merge for unstructured objects (CRDs, CRs) now produces the current->merged patch as patch.data with patchType MergePatchType, so it flows through both the server dry-run and the local merge path. - #1068/#1065/#1044 rewrote the metadata tidy logic with pruneNestedMap. Keep that implementation (a superset of the annotation cleanup this PR inlined) together with the null-input and type-safety hardening of deleteStatusAndTidyMetadata. - generate_test.go was created independently on both sides; keep master's local-merge tests and re-add this PR's unstructured/CRD tests, adapted to the new createPatch signature. Signed-off-by: yxxhero <yxxhero@users.noreply.github.com> Signed-off-by: yxxhero <aiopsclub@163.com>
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
2 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.
running helm diff against fluxcd managed helm release also shows a diff in terms of labels.
The current workaround is using
However, each single resource is present in the output with a suppressed notice.
An alternative approach would be:
The strip-output-lines is executed on source and target, before diff. Without any notice on the diff output.