fix: kube-prom-stack thanos-ruler alertmanagerConfigs (prometheus-com…

…munity#3870) Signed-off-by: ThameezBo <[email protected]> Signed-off-by: Quentin Bisson <[email protected]> Co-authored-by: Quentin Bisson <[email protected]>
giffgaff · Mar 20, 2024 · c0ec979 · c0ec979
1 parent 9448bf0
commit c0ec979
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 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: 51.5.1
+version: 51.5.2
 appVersion: v0.68.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/templates/thanos-ruler/ruler.yaml b/charts/kube-prometheus-stack/templates/thanos-ruler/ruler.yaml
@@ -73,7 +73,8 @@ spec:
 {{- end }}
 {{- if .Values.thanosRuler.thanosRulerSpec.alertmanagersConfig }}
   alertmanagersConfig:
-{{ toYaml .Values.thanosRuler.thanosRulerSpec.alertmanagersConfig | indent 4 }}
+    key: alertmanager-configs.yaml
+    name: {{ template "kube-prometheus-stack.thanosRuler.name" . }}
 {{- end }}
 {{- if .Values.thanosRuler.thanosRulerSpec.queryEndpoints }}
   queryEndpoints:

diff --git a/charts/kube-prometheus-stack/templates/thanos-ruler/secret.yaml b/charts/kube-prometheus-stack/templates/thanos-ruler/secret.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.thanosRuler.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "kube-prometheus-stack.thanosRuler.name" . }}
+  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  labels:
+    app: {{ include "kube-prometheus-stack.thanosRuler.name" . }}
+{{ include "kube-prometheus-stack.labels" . | indent 4 }}
+data:
+{{- if .Values.thanosRuler.thanosRulerSpec.alertmanagersConfig }}
+  alertmanager-configs.yaml: {{ toYaml .Values.thanosRuler.thanosRulerSpec.alertmanagersConfig | b64enc | quote }}
+{{- end }}
+{{- end }}