ssa: add DriftIgnoreRules to ApplyOptions for field-level ignore on apply#1157
Open
dipti-pai wants to merge 1 commit intofluxcd:mainfrom
Open
ssa: add DriftIgnoreRules to ApplyOptions for field-level ignore on apply#1157dipti-pai wants to merge 1 commit intofluxcd:mainfrom
dipti-pai wants to merge 1 commit intofluxcd:mainfrom
Conversation
matheuscscp
reviewed
Apr 1, 2026
…pply Signed-off-by: Dipti Pai <diptipai89@outlook.com>
877f705 to
4849129
Compare
matheuscscp
approved these changes
Apr 10, 2026
Member
matheuscscp
left a comment
There was a problem hiding this comment.
The code is looking great to me, but I'd like to better understand how applying the ignore rules after dry-run works. I'm not saying it's not correct at all, just saying that it's probably correct and I need to catch up and understand the whole flow. It would be great if we could talk about this in the next dev meeting 🙏
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
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.
Changes include
[]jsondiff.IgnoreRuletossaApplyOptionscreatecode paths. InApplyandApplyAllcode paths that correspond toupdate, remove ignored fields matching the ignored rules from the object.Includes tests for various scenarios for optional and mandatory fields, claiming shared/forceful ownership and orphaning owned fields without a manager.
Associated kustomize controller draft PR testing the changes from controller perspective - fluxcd/kustomize-controller#1627
Fixes: #696