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

fix: align `flux diff` skipping with kustomize-controller
pull/5181/head
Stefan Prodan 3 months ago committed by GitHub
commit dcc4251a2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -100,6 +100,10 @@ func (b *Builder) diff() (string, bool, error) {
diffOptions := ssa.DiffOptions{ diffOptions := ssa.DiffOptions{
Exclusions: map[string]string{ Exclusions: map[string]string{
"kustomize.toolkit.fluxcd.io/reconcile": "disabled", "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) change, liveObject, mergedObject, err := resourceManager.Diff(ctx, obj, diffOptions)

Loading…
Cancel
Save