Merge pull request #5176 from YvanGuidoin/diff-dry-run-skipping

fix: align `flux diff` skipping with kustomize-controller
fluxcd · Feb 9, 2025 · dcc4251 · dcc4251
2 parents 6f815a3 + 960f72f
commit dcc4251
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/internal/build/diff.go b/internal/build/diff.go
@@ -100,6 +100,10 @@ func (b *Builder) diff() (string, bool, error) {
 		diffOptions := ssa.DiffOptions{
 			Exclusions: map[string]string{
 				"kustomize.toolkit.fluxcd.io/reconcile": "disabled",
+				"kustomize.toolkit.fluxcd.io/ssa":       "ignore",
+			},
+			IfNotPresentSelector: map[string]string{
+				"kustomize.toolkit.fluxcd.io/ssa": "ifnotpresent",
 			},
 		}
 		change, liveObject, mergedObject, err := resourceManager.Diff(ctx, obj, diffOptions)