From 5071dfa13beffd737cd9ab59983e99dc280f9775 Mon Sep 17 00:00:00 2001
From: Sebastian Gaiser <sebastiangaiser@users.noreply.github.com>
Date: Mon, 1 Jul 2024 11:15:20 +0000
Subject: [PATCH] [kube-prometheus-stack]: fix to make sure that
 'grafana.sidecar.datasources.name' is always a string

Signed-off-by: Sebastian Gaiser <sebastiangaiser@users.noreply.github.com>
---
 charts/kube-prometheus-stack/Chart.yaml                     | 2 +-
 charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml | 6 ++++++
 .../templates/grafana/configmaps-datasources.yaml           | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
index c11fb576e009..bcbe5d0c4a85 100644
--- a/charts/kube-prometheus-stack/Chart.yaml
+++ b/charts/kube-prometheus-stack/Chart.yaml
@@ -23,7 +23,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 61.1.0
+version: 61.1.1
 appVersion: v0.75.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
diff --git a/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml b/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml
index 18ad385989c9..2f80650f9c2f 100644
--- a/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml
+++ b/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml
@@ -78,6 +78,12 @@ kubeProxy:
       matchLabels:
         k8s-app: kube-proxy
 
+grafana:
+  sidecar:
+    datasources:
+      alertmanager:
+        name: 0
+
 nodeExporter:
   enabled: true
   forceDeployDashboards: true
diff --git a/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml b/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml
index 1fdfa5b84528..68e4f4c08f15 100644
--- a/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml
+++ b/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml
@@ -22,7 +22,7 @@ data:
     datasources:
 {{- $scrapeInterval := .Values.grafana.sidecar.datasources.defaultDatasourceScrapeInterval | default .Values.prometheus.prometheusSpec.scrapeInterval | default "30s" }}
 {{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled }}
-    - name: {{ .Values.grafana.sidecar.datasources.name }}
+    - name: "{{ .Values.grafana.sidecar.datasources.name }}"
       type: prometheus
       uid: {{ .Values.grafana.sidecar.datasources.uid }}
       {{- if .Values.grafana.sidecar.datasources.url }}
@@ -45,7 +45,7 @@ data:
 {{- end }}
 {{- if .Values.grafana.sidecar.datasources.createPrometheusReplicasDatasources }}
 {{- range until (int .Values.prometheus.prometheusSpec.replicas) }}
-    - name: {{ .Values.grafana.sidecar.datasources.name }}-{{ . }}
+    - name: "{{ $.Values.grafana.sidecar.datasources.name }}-{{ . }}"
       type: prometheus
       uid: {{ $.Values.grafana.sidecar.datasources.uid }}-replica-{{ . }}
       url: http://prometheus-{{ template "kube-prometheus-stack.prometheus.crname" $ }}-{{ . }}.prometheus-operated:9090/{{ trimPrefix "/" $.Values.prometheus.prometheusSpec.routePrefix }}
@@ -61,7 +61,7 @@ data:
 {{- end }}
 {{- end }}
 {{- if .Values.grafana.sidecar.datasources.alertmanager.enabled }}
-    - name: {{ .Values.grafana.sidecar.datasources.alertmanager.name }}
+    - name: "{{ .Values.grafana.sidecar.datasources.alertmanager.name }}"
       type: alertmanager
       uid: {{ .Values.grafana.sidecar.datasources.alertmanager.uid }}
       {{- if .Values.grafana.sidecar.datasources.alertmanager.url }}