actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-25 00:51:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

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

Browse source 
fix: align `flux diff` skipping with kustomize-controller
This commit is contained in:
Stefan Prodan 2025-02-09 11:35:49 +02:00 committed by GitHub
commit dcc4251a2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/build/diff.go
View file

@ -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)