Merge pull request #2895 from JordanGoasdoue/fix-secret-datasources

[grafana] fix secret datasources/notifiers rendering
grafana · Jan 15, 2024 · dae491a · dae491a
2 parents 19a40de + 7aaf6f2
commit dae491a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 7.2.0
+version: 7.2.1
 appVersion: 10.2.3
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/charts/grafana/templates/configSecret.yaml b/charts/grafana/templates/configSecret.yaml
@@ -25,13 +25,13 @@ stringData:
 {{- range $key, $value := .Values.datasources }}
 {{- if (hasKey $value "secret") }}
 {{- $key | nindent 2 }}: |
-  {{- tpl (toYaml $value | nindent 4) $root }}
+  {{- tpl (toYaml $value.secret | nindent 4) $root }}
 {{- end }}
 {{- end }}
 {{- range $key, $value := .Values.notifiers }}
 {{- if (hasKey $value "secret") }}
 {{- $key | nindent 2 }}: |
-  {{- tpl (toYaml $value | nindent 4) $root }}
+  {{- tpl (toYaml $value.secret | nindent 4) $root }}
 {{- end }}
 {{- end }}
 {{- range $key, $value := .Values.alerting }}
@@ -40,4 +40,4 @@ stringData:
     {{- tpl (toYaml $value.secret | nindent 4) $root }}
   {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}