From 960f72fe6a24f096a426b6f89ee0dc71e5add331 Mon Sep 17 00:00:00 2001 From: Yvan Date: Thu, 6 Feb 2025 11:57:17 +0000 Subject: [PATCH] Align skipping of resources in flux diff to kustomize-controller Signed-off-by: Yvan --- internal/build/diff.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/build/diff.go b/internal/build/diff.go index 1700220200..b6636641e2 100644 --- 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)