fix conflict between mounting a file and mounting a folder (#7497)

* fix conflict between dashboardProviders mounting a file and sidecar mounting a folder, so one can use both mechanisms in harmony

Signed-off-by: Hanjo Meinhardt <hanjo@bunix.de>

* bump the chart version

Signed-off-by: Hanjo Meinhardt <hanjo@bunix.de>
This commit is contained in:
bunix42
2018-09-03 01:02:30 -07:00
committed by k8s-ci-robot
parent 7588d5859e
commit 1edb7906f8
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: grafana
version: 1.14.2
version: 1.14.3
appVersion: 5.2.3
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
+2 -2
View File
@@ -134,7 +134,8 @@ spec:
- name: sc-dashboard-volume
mountPath: {{ .Values.sidecar.dashboards.folder | quote }}
- name: sc-dashboard-provider
mountPath: "/etc/grafana/provisioning/dashboards"
mountPath: "/etc/grafana/provisioning/dashboards/sc-dashboardproviders.yaml"
subPath: provider.yaml
{{- end}}
{{- if .Values.sidecar.datasources.enabled }}
- name: sc-datasources-volume
@@ -271,4 +272,3 @@ spec:
secret:
secretName: {{ .secretName }}
{{- end }}