From 7763584858dfbba0e187c1de1365d74411147cc3 Mon Sep 17 00:00:00 2001 From: kwt Date: Thu, 7 Mar 2019 00:04:58 -0700 Subject: [PATCH] add 'file' dashboard type logic to grafana deployment volume mounts. fixes #11826. (#11969) Signed-off-by: Ken Talley --- stable/grafana/Chart.yaml | 2 +- stable/grafana/templates/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 3a93f14cbb..45a05d2ccd 100755 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 2.2.1 +version: 2.2.2 appVersion: 6.0.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml index 5f2cd1e985..e26c80df0a 100644 --- a/stable/grafana/templates/deployment.yaml +++ b/stable/grafana/templates/deployment.yaml @@ -152,7 +152,7 @@ spec: {{- if .Values.dashboards }} {{- range $provider, $dashboards := .Values.dashboards }} {{- range $key, $value := $dashboards }} - {{- if hasKey $value "json" }} + {{- if (or (hasKey $value "json") (hasKey $value "file")) }} - name: dashboards-{{ $provider }} mountPath: "/var/lib/grafana/dashboards/{{ $provider }}/{{ $key }}.json" subPath: "{{ $key }}.json"