From e7e3012f25807031502221ec6d83d00d1100d597 Mon Sep 17 00:00:00 2001
From: Koren Peretz <62677694+KorenP1@users.noreply.github.com>
Date: Thu, 15 May 2025 14:39:15 +0300
Subject: [PATCH] [bitnami/grafana] Grafana uniq dashboard volumes (#33689)

---
 bitnami/grafana/CHANGELOG.md              |  7 ++++++-
 bitnami/grafana/Chart.yaml                |  2 +-
 bitnami/grafana/templates/deployment.yaml | 10 +++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bitnami/grafana/CHANGELOG.md b/bitnami/grafana/CHANGELOG.md
index d84238e631..5421105f59 100644
--- a/bitnami/grafana/CHANGELOG.md
+++ b/bitnami/grafana/CHANGELOG.md
@@ -1,8 +1,13 @@
 # Changelog
 
+## 12.0.1 (2025-05-14)
+
+* [bitnami/grafana] Grafana uniq dashboard volumes ([#33689](https://github.com/bitnami/charts/pull/33689))
+
 ## 12.0.0 (2025-05-12)
 
-* [bitnami/grafana] :zap: :arrow_up: Update dependency references ([#33604](https://github.com/bitnami/charts/pull/33604))
+* [bitnami/grafana] :zap: :arrow_up: Update dependency references (#33604) ([4229d77](https://github.com/bitnami/charts/commit/4229d7766abffbc8cf3f299016d1dc4d0be8796c)), closes [#33604](https://github.com/bitnami/charts/issues/33604)
+* [bitnami/kubeapps] Deprecation followup (#33579) ([77e312c](https://github.com/bitnami/charts/commit/77e312c1772d4d7c4dc5d3ac0e80f4e452e3a062)), closes [#33579](https://github.com/bitnami/charts/issues/33579)
 
 ## <small>11.6.7 (2025-05-07)</small>
 
diff --git a/bitnami/grafana/Chart.yaml b/bitnami/grafana/Chart.yaml
index 9d587d6f27..c985c1ab3d 100644
--- a/bitnami/grafana/Chart.yaml
+++ b/bitnami/grafana/Chart.yaml
@@ -33,4 +33,4 @@ maintainers:
 name: grafana
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/grafana
-version: 12.0.0
+version: 12.0.1
diff --git a/bitnami/grafana/templates/deployment.yaml b/bitnami/grafana/templates/deployment.yaml
index 4df5ba1409..e6c675582c 100644
--- a/bitnami/grafana/templates/deployment.yaml
+++ b/bitnami/grafana/templates/deployment.yaml
@@ -355,10 +355,14 @@ spec:
             name: {{ include "common.names.fullname" . }}-provider
             {{- end }}
         {{- end }}
-        {{- range .Values.dashboardsConfigMaps }}
-        - name: {{ include "common.tplvalues.render" ( dict "value" .configMapName "context" $ ) }}
+{{- $dashboardConfigMapNames := list }}
+{{- range .Values.dashboardsConfigMaps }}
+  {{- $dashboardConfigMapNames = append $dashboardConfigMapNames .configMapName }}
+{{- end }}
+        {{- range $dashboardConfigMapNames | uniq }}
+        - name: {{ include "common.tplvalues.render" ( dict "value" . "context" $ ) }}
           configMap:
-            name: {{ include "common.tplvalues.render" ( dict "value" .configMapName "context" $ ) }}
+            name: {{ include "common.tplvalues.render" ( dict "value" . "context" $ ) }}
         {{- end }}
         {{- if .Values.datasources.secretName }}
         - name: datasources