Merge pull request #17 from fluxcd/hr-v2beta2

Update to `HelmRelease` v2beta2 API
fluxcd · Dec 12, 2023 · 7906771 · 7906771
2 parents b99583d + 0c12c20
commit 7906771
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/monitoring/controllers/kube-prometheus-stack/kube-state-metrics-config.yaml b/monitoring/controllers/kube-prometheus-stack/kube-state-metrics-config.yaml
@@ -54,7 +54,7 @@ kube-state-metrics:
                   source_name: [ spec, sourceRef, name ]
           - groupVersionKind:
               group: helm.toolkit.fluxcd.io
-              version: v2beta1
+              version: v2beta2
               kind: HelmRelease
             metricNamePrefix: gotk
             metrics:

diff --git a/monitoring/controllers/kube-prometheus-stack/release.yaml b/monitoring/controllers/kube-prometheus-stack/release.yaml
@@ -1,12 +1,12 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: kube-prometheus-stack
 spec:
   interval: 1h
   chart:
     spec:
-      version: "48.x"
+      version: "54.x"
       chart: kube-prometheus-stack
       sourceRef:
         kind: HelmRepository
@@ -16,6 +16,13 @@ spec:
     crds: Create
   upgrade:
     crds: CreateReplace
+  driftDetection:
+    mode: enabled
+    ignore:
+      # Ignore "validated" annotation which is not inserted during install
+      - paths: [ "/metadata/annotations/prometheus-operator-validated" ]
+        target:
+          kind: PrometheusRule
   valuesFrom:
   - kind: ConfigMap
     name: flux-kube-state-metrics-config
@@ -38,21 +45,3 @@ spec:
     grafana:
       defaultDashboardsEnabled: false
       adminPassword: flux
-  postRenderers:
-    - kustomize:
-        patches:
-          - target:
-              # Ignore these objects from Flux diff as they are mutated from chart hooks
-              kind: (ValidatingWebhookConfiguration|MutatingWebhookConfiguration)
-              name: kube-prometheus-stack-admission
-            patch: |
-              - op: add
-                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 at dry-run time
-              kind: PrometheusRule
-            patch: |
-              - op: add
-                path: /metadata/annotations/helm.toolkit.fluxcd.io~1driftDetection
-                value: disabled
diff --git a/monitoring/controllers/loki-stack/release.yaml b/monitoring/controllers/loki-stack/release.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: loki-stack