From 07beb7467209eb238442999a29fa6bca2fa29a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fl=C3=A1vio=20Ferreira?= <flaviommferreira@gmail.com>
Date: Tue, 16 Oct 2018 10:39:56 +0100
Subject: [PATCH] [stable/prometheus] Add option to configure subpath on server
 volume mounts (#8113)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add subpath support to prometheus

Signed-off-by: Flávio Ferreira <flaviommferreira@gmail.com>

* Bump prometheus chart version

Signed-off-by: Flávio Ferreira <flaviommferreira@gmail.com>

* Bump chart version

Signed-off-by: Flávio Ferreira <flaviommferreira@gmail.com>

* Add example of subPath to prometheus values file

Signed-off-by: Flávio Ferreira <flaviommferreira@gmail.com>
---
 stable/prometheus/Chart.yaml                       | 2 +-
 stable/prometheus/templates/server-deployment.yaml | 4 ++++
 stable/prometheus/values.yaml                      | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
index 3675af626f..a73e5fba63 100755
--- a/stable/prometheus/Chart.yaml
+++ b/stable/prometheus/Chart.yaml
@@ -1,5 +1,5 @@
 name: prometheus
-version: 7.3.0
+version: 7.3.1
 appVersion: 2.4.3
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/
diff --git a/stable/prometheus/templates/server-deployment.yaml b/stable/prometheus/templates/server-deployment.yaml
index 418d703ddf..2a961bd2d5 100644
--- a/stable/prometheus/templates/server-deployment.yaml
+++ b/stable/prometheus/templates/server-deployment.yaml
@@ -73,6 +73,7 @@ spec:
           {{- range .Values.configmapReload.extraConfigmapMounts }}
             - name: {{ $.Values.configmapReload.name }}-{{ .name }}
               mountPath: {{ .mountPath }}
+              subPath: {{ .subPath }}
               readOnly: {{ .readOnly }}
           {{- end }}
 
@@ -122,16 +123,19 @@ spec:
           {{- range .Values.server.extraHostPathMounts }}
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
+              subPath: {{ .subPath }}
               readOnly: {{ .readOnly }}
           {{- end }}
           {{- range .Values.server.extraConfigmapMounts }}
             - name: {{ $.Values.server.name }}-{{ .name }}
               mountPath: {{ .mountPath }}
+              subPath: {{ .subPath }}
               readOnly: {{ .readOnly }}
           {{- end }}
           {{- range .Values.server.extraSecretMounts }}
             - name: {{ .name }}
               mountPath: {{ .mountPath }}
+              subPath: {{ .subPath }}
               readOnly: {{ .readOnly }}
           {{- end }}
     {{- if .Values.server.nodeSelector }}
diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml
index 3581ce0446..8224c9843f 100644
--- a/stable/prometheus/values.yaml
+++ b/stable/prometheus/values.yaml
@@ -230,6 +230,7 @@ configmapReload:
   extraConfigmapMounts: []
     # - name: prometheus-alerts
     #   mountPath: /etc/alerts.d
+    #   subPath: ""
     #   configMap: prometheus-alerts
     #   readOnly: true
 
@@ -507,12 +508,14 @@ server:
   extraHostPathMounts: []
     # - name: certs-dir
     #   mountPath: /etc/kubernetes/certs
+    #   subPath: ""
     #   hostPath: /etc/kubernetes/certs
     #   readOnly: true
 
   extraConfigmapMounts: []
     # - name: certs-configmap
     #   mountPath: /prometheus
+    #   subPath: ""
     #   configMap: certs-configmap
     #   readOnly: true
 
@@ -521,6 +524,7 @@ server:
   extraSecretMounts: []
     # - name: secret-files
     #   mountPath: /etc/secrets
+    #   subPath: ""
     #   secretName: prom-secret-files
     #   readOnly: true