[kube-prometheus-stack] fix failure-policy on patch-webhook job

Signed-off-by: Jonas Badstübner <[email protected]>
prometheus-community · Dec 20, 2023 · aa3fcec · aa3fcec
1 parent 8f37709
commit aa3fcec
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -21,7 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 55.5.0
+version: 55.5.1
 appVersion: v0.70.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/templates/_helpers.tpl b/charts/kube-prometheus-stack/templates/_helpers.tpl
@@ -297,3 +297,20 @@ global:
 {{ $fullname }}-webhook.{{ $namespace }}.svc
 {{- end }}
 {{- end }}
+
+{{/*
+Defines the failurePolicy, which is "Ignore" or "Fail".
+If failurePolicy is set to "IgnoreOnInstallOnly":
+  If Release.IsInstall returns "true", returns "Ignore" otherwise "Fail"
+*/}}
+{{- define "kube-prometheus-stack.operator.admission-webhook.failurePolicy" -}}
+{{- if eq .Values.prometheusOperator.admissionWebhooks.failurePolicy "IgnoreOnInstallOnly" -}}
+{{ .Release.IsInstall | ternary "Ignore" "Fail" -}}
+{{- else if .Values.prometheusOperator.admissionWebhooks.failurePolicy  -}}
+{{ .Values.prometheusOperator.admissionWebhooks.failurePolicy }}
+{{- else if .Values.prometheusOperator.admissionWebhooks.patch.enabled -}}
+Ignore
+{{- else -}}
+Fail
+{{- end -}}
+{{- end -}}
diff --git a/...us-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/...us-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -46,7 +46,7 @@ spec:
             - --webhook-name={{ template "kube-prometheus-stack.fullname" . }}-admission
             - --namespace={{ template "kube-prometheus-stack.namespace" . }}
             - --secret-name={{ template "kube-prometheus-stack.fullname" . }}-admission
-            - --patch-failure-policy={{ .Values.prometheusOperator.admissionWebhooks.failurePolicy }}
+            - --patch-failure-policy={{ include "kube-prometheus-stack.operator.admission-webhook.failurePolicy" $ }}
           {{- with .Values.prometheusOperator.admissionWebhooks.patchWebhookJob }}
           securityContext:
           {{ toYaml .securityContext | nindent 12 }}

diff --git a/...-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml b/...-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml
@@ -13,15 +13,7 @@ metadata:
 {{- include "kube-prometheus-stack.labels" $ | indent 4 }}
 webhooks:
   - name: prometheusrulemutate.monitoring.coreos.com
-    {{- if eq .Values.prometheusOperator.admissionWebhooks.failurePolicy "IgnoreOnInstallOnly" }}
-    failurePolicy: {{ .Release.IsInstall | ternary "Ignore" "Fail" }}
-    {{- else if .Values.prometheusOperator.admissionWebhooks.failurePolicy  }}
-    failurePolicy: {{ .Values.prometheusOperator.admissionWebhooks.failurePolicy }}
-    {{- else if .Values.prometheusOperator.admissionWebhooks.patch.enabled }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: Fail
-    {{- end }}
+    failurePolicy: {{ include "kube-prometheus-stack.operator.admission-webhook.failurePolicy" $ }}
     rules:
       - apiGroups:
           - monitoring.coreos.com

diff --git a/...tack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml b/...tack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml
@@ -13,15 +13,7 @@ metadata:
 {{- include "kube-prometheus-stack.labels" $ | indent 4 }}
 webhooks:
   - name: prometheusrulemutate.monitoring.coreos.com
-    {{- if eq .Values.prometheusOperator.admissionWebhooks.failurePolicy "IgnoreOnInstallOnly" }}
-    failurePolicy: {{ .Release.IsInstall | ternary "Ignore" "Fail" }}
-    {{- else if .Values.prometheusOperator.admissionWebhooks.failurePolicy  }}
-    failurePolicy: {{ .Values.prometheusOperator.admissionWebhooks.failurePolicy }}
-    {{- else if .Values.prometheusOperator.admissionWebhooks.patch.enabled }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: Fail
-    {{- end }}
+    failurePolicy: {{ include "kube-prometheus-stack.operator.admission-webhook.failurePolicy" $ }}
     rules:
       - apiGroups:
           - monitoring.coreos.com