Merge pull request #1481 from zanac1986/fix-cve-2021-25742

[grafana] fix cve-2021-25742
grafana · Jun 11, 2022 · 7cdf73f · 7cdf73f
2 parents 80dc081 + fda5e90
commit 7cdf73f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 6.29.7
+version: 6.29.8
 appVersion: 8.5.3
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/charts/grafana/templates/configmap-dashboard-provider.yaml b/charts/grafana/templates/configmap-dashboard-provider.yaml
@@ -11,6 +11,7 @@ metadata:
   name: {{ template "grafana.fullname" . }}-config-dashboards
   namespace: {{ template "grafana.namespace" . }}
 data:
+  allow-snippet-annotations: "false"
   provider.yaml: |-
     apiVersion: 1
     providers:

diff --git a/charts/grafana/templates/configmap.yaml b/charts/grafana/templates/configmap.yaml
@@ -10,6 +10,7 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 data:
+  allow-snippet-annotations: "false"
 {{- if .Values.plugins }}
   plugins: {{ join "," .Values.plugins }}
 {{- end }}