From 5b7b85ea7c500f62b1290b693b0928e64f0e81dc Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 1 Mar 2023 09:35:53 +0100 Subject: [PATCH] Change to `helm.toolkit.fluxcd.io/driftDetection` Signed-off-by: Hidde Beydals --- docs/spec/v2beta1/helmreleases.md | 8 ++++---- internal/diff/differ.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/spec/v2beta1/helmreleases.md b/docs/spec/v2beta1/helmreleases.md index 3ac65fa29..2bdf27114 100644 --- a/docs/spec/v2beta1/helmreleases.md +++ b/docs/spec/v2beta1/helmreleases.md @@ -1283,7 +1283,7 @@ dry-run), the controller will perform an upgrade for the release, restoring the ### Excluding resources from drift detection The drift detection feature can be configured to exclude certain resources from the comparison -by labeling or annotating them with `helm.toolkit.fluxcd.io/diff: disabled`. Using +by labeling or annotating them with `helm.toolkit.fluxcd.io/driftDetection: disabled`. Using [post-renderers](#post-renderers), this can be applied to any resource rendered by Helm. ```yaml @@ -1302,7 +1302,7 @@ spec: name: my-app patch: | - op: add - path: /metadata/annotations/helm.toolkit.fluxcd.io~1diff + path: /metadata/annotations/helm.toolkit.fluxcd.io~1driftDetection value: disabled ``` @@ -1344,7 +1344,7 @@ spec: name: kube-prometheus-stack-admission patch: | - op: add - path: /metadata/annotations/helm.toolkit.fluxcd.io~1diff + path: /metadata/annotations/helm.toolkit.fluxcd.io~1driftDetection value: disabled - target: # Ignore these objects from Flux diff as they are mutated at apply time but not @@ -1352,7 +1352,7 @@ spec: kind: PrometheusRule patch: | - op: add - path: /metadata/annotations/helm.toolkit.fluxcd.io~1diff + path: /metadata/annotations/helm.toolkit.fluxcd.io~1driftDetection value: disabled ``` diff --git a/internal/diff/differ.go b/internal/diff/differ.go index baf87a08c..9359fa3f6 100644 --- a/internal/diff/differ.go +++ b/internal/diff/differ.go @@ -39,7 +39,7 @@ import ( var ( // MetadataKey is the label or annotation key used to disable the diffing // of an object. - MetadataKey = helmv1.GroupVersion.Group + "/diff" + MetadataKey = helmv1.GroupVersion.Group + "/driftDetection" // MetadataDisabledValue is the value used to disable the diffing of an // object using MetadataKey. MetadataDisabledValue = "disabled"