From ef07a43bb7509f1545a8238fcd2f4873b9218f55 Mon Sep 17 00:00:00 2001 From: Minh Danh Date: Thu, 18 Jul 2019 14:04:11 +0700 Subject: [PATCH] [stable/grafana] Fix custom dashboard folders breakage (#15550) * Fix custom dashboard folders breakage Signed-off-by: Minh Danh * Bump version to 3.5.12 Signed-off-by: Minh Danh --- stable/grafana/Chart.yaml | 2 +- stable/grafana/templates/deployment.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index b04f8f3ded..65730615a6 100755 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 3.5.11 +version: 3.5.12 appVersion: 6.2.5 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 59fa284569..7bf704266c 100644 --- a/stable/grafana/templates/deployment.yaml +++ b/stable/grafana/templates/deployment.yaml @@ -213,10 +213,12 @@ spec: {{- if .Values.sidecar.dashboards.enabled }} - name: sc-dashboard-volume mountPath: {{ .Values.sidecar.dashboards.folder | quote }} +{{- if not .Values.dashboardProviders }} - name: sc-dashboard-provider mountPath: "/etc/grafana/provisioning/dashboards/sc-dashboardproviders.yaml" subPath: provider.yaml {{- end}} +{{- end}} {{- if .Values.sidecar.datasources.enabled }} - name: sc-datasources-volume mountPath: "/etc/grafana/provisioning/datasources" @@ -353,9 +355,11 @@ spec: {{- if .Values.sidecar.dashboards.enabled }} - name: sc-dashboard-volume emptyDir: {} +{{- if not .Values.dashboardProviders }} - name: sc-dashboard-provider configMap: name: {{ template "grafana.fullname" . }}-config-dashboards +{{- end }} {{- end }} {{- if .Values.sidecar.datasources.enabled }} - name: sc-datasources-volume