[kube-prometheus-stack] set --force-conflicts on CRD job (#5288)

Signed-off-by: Devin Buhl <devin@buhl.casa>
prometheus-community · Feb 6, 2025 · 35f1d80 · 35f1d80
1 parent c48cdcf
commit 35f1d80
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -31,7 +31,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 69.0.0
+version: 69.1.0
 appVersion: v0.80.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/charts/crds/templates/upgrade/job.yaml b/charts/kube-prometheus-stack/charts/crds/templates/upgrade/job.yaml
@@ -86,6 +86,9 @@ spec:
           args:
             - apply
             - --server-side
+            {{- if .Values.upgradeJob.forceConflicts }}
+            - --force-conflicts
+            {{- end }}
             - --filename
             - /tmp/crds.yaml
           {{- with .Values.upgradeJob.resources }}

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -38,6 +38,7 @@ crds:
   ## This feature is in preview, off by default and may change in the future.
   upgradeJob:
     enabled: false
+    forceConflicts: false
     image:
       busybox:
         registry: docker.io