From 94676ddb4594f5bfa12cfd48d3a7f9c93aca404e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sun, 6 Sep 2026 20:14:00 +0200 Subject: [PATCH 1/3] fix: strip fluxcd managed labels --- manifest/util.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest/util.go b/manifest/util.go index 96a1368a..a9e72b51 100644 --- a/manifest/util.go +++ b/manifest/util.go @@ -30,7 +30,11 @@ func deleteStatusAndTidyMetadata(obj []byte) (map[string]interface{}, error) { "meta.helm.sh/release-namespace", "deployment.kubernetes.io/revision", ) - pruneNestedMap(metadata, "labels", "app.kubernetes.io/managed-by") + pruneNestedMap(metadata, "labels", + "app.kubernetes.io/managed-by", + "helm.toolkit.fluxcd.io/name", + "helm.toolkit.fluxcd.io/namespace", + ) return objectMap, nil } From a3fe36a06dfcc958ee90e981e131dcc05b00d3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Tue, 8 Sep 2026 09:20:14 +0200 Subject: [PATCH 2/3] Add new labels to pruneNestedMap function --- manifest/util.go | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest/util.go b/manifest/util.go index a9e72b51..6e904965 100644 --- a/manifest/util.go +++ b/manifest/util.go @@ -30,6 +30,7 @@ func deleteStatusAndTidyMetadata(obj []byte) (map[string]interface{}, error) { "meta.helm.sh/release-namespace", "deployment.kubernetes.io/revision", ) + pruneNestedMap(metadata, "labels", "app.kubernetes.io/managed-by", "helm.toolkit.fluxcd.io/name", From 0caaf083221d75e65f8a9078e1aa88ed80ad3a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Tue, 8 Sep 2026 09:21:46 +0200 Subject: [PATCH 3/3] Apply suggestion from @jkroepke --- manifest/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest/util.go b/manifest/util.go index 6e904965..a599fbca 100644 --- a/manifest/util.go +++ b/manifest/util.go @@ -31,7 +31,7 @@ func deleteStatusAndTidyMetadata(obj []byte) (map[string]interface{}, error) { "deployment.kubernetes.io/revision", ) - pruneNestedMap(metadata, "labels", + pruneNestedMap(metadata, "labels", "app.kubernetes.io/managed-by", "helm.toolkit.fluxcd.io/name", "helm.toolkit.fluxcd.io/namespace",