Skip to content

Commit 5b7b85e

Browse files
committed
Change to helm.toolkit.fluxcd.io/driftDetection
Signed-off-by: Hidde Beydals <hidde@hhh.computer>
1 parent 19ee613 commit 5b7b85e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

docs/spec/v2beta1/helmreleases.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ dry-run), the controller will perform an upgrade for the release, restoring the
12831283
### Excluding resources from drift detection
12841284

12851285
The drift detection feature can be configured to exclude certain resources from the comparison
1286-
by labeling or annotating them with `helm.toolkit.fluxcd.io/diff: disabled`. Using
1286+
by labeling or annotating them with `helm.toolkit.fluxcd.io/driftDetection: disabled`. Using
12871287
[post-renderers](#post-renderers), this can be applied to any resource rendered by Helm.
12881288

12891289
```yaml
@@ -1302,7 +1302,7 @@ spec:
13021302
name: my-app
13031303
patch: |
13041304
- op: add
1305-
path: /metadata/annotations/helm.toolkit.fluxcd.io~1diff
1305+
path: /metadata/annotations/helm.toolkit.fluxcd.io~1driftDetection
13061306
value: disabled
13071307
```
13081308

@@ -1344,15 +1344,15 @@ spec:
13441344
name: kube-prometheus-stack-admission
13451345
patch: |
13461346
- op: add
1347-
path: /metadata/annotations/helm.toolkit.fluxcd.io~1diff
1347+
path: /metadata/annotations/helm.toolkit.fluxcd.io~1driftDetection
13481348
value: disabled
13491349
- target:
13501350
# Ignore these objects from Flux diff as they are mutated at apply time but not
13511351
# at dry-run time
13521352
kind: PrometheusRule
13531353
patch: |
13541354
- op: add
1355-
path: /metadata/annotations/helm.toolkit.fluxcd.io~1diff
1355+
path: /metadata/annotations/helm.toolkit.fluxcd.io~1driftDetection
13561356
value: disabled
13571357
```
13581358

internal/diff/differ.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
var (
4040
// MetadataKey is the label or annotation key used to disable the diffing
4141
// of an object.
42-
MetadataKey = helmv1.GroupVersion.Group + "/diff"
42+
MetadataKey = helmv1.GroupVersion.Group + "/driftDetection"
4343
// MetadataDisabledValue is the value used to disable the diffing of an
4444
// object using MetadataKey.
4545
MetadataDisabledValue = "disabled"

0 commit comments

Comments
 (0)