[stable/grafana] Fix custom dashboard folders breakage (#15550)

* Fix custom dashboard folders breakage

Signed-off-by: Minh Danh <minhdanh.ngo@gmail.com>

* Bump version to 3.5.12

Signed-off-by: Minh Danh <minhdanh.ngo@gmail.com>
This commit is contained in:
Minh Danh
2019-07-18 00:04:11 -07:00
committed by Kubernetes Prow Robot
parent eee6593ecc
commit ef07a43bb7
2 changed files with 5 additions and 1 deletions
+1 -1
View File
@@ -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.
+4
View File
@@ -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