From 1edb7906f8001274e69d2fd075e972090dd2ca09 Mon Sep 17 00:00:00 2001 From: bunix42 Date: Mon, 3 Sep 2018 10:02:30 +0200 Subject: [PATCH] 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 * bump the chart version Signed-off-by: Hanjo Meinhardt --- stable/grafana/Chart.yaml | 2 +- stable/grafana/templates/deployment.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 496d1f8159..12cb084c7d 100755 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -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. diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml index fbbb823305..93f8ad87ab 100644 --- a/stable/grafana/templates/deployment.yaml +++ b/stable/grafana/templates/deployment.yaml @@ -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 }} -