[stable/grafana] Add env vars for download dashboard container (#16062)

* [stable/grafana] Add env values for download dashboard images

Signed-off-by: Caspar Rolfe <caspar.rolfe@gmail.com>

* [stable/grafana] Update docs

Signed-off-by: Caspar Rolfe <caspar.rolfe@gmail.com>

stable/grafana/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 3.7.3
+version: 3.8.0
 appVersion: 6.2.5
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

stable/grafana/README.md

@@ -123,7 +123,8 @@ The command removes all the Kubernetes components associated with the chart and
 | `command`                     | Define command to be executed by grafana container at startup  | `nil` |
 | `testFramework.image`                     | `test-framework` image repository.             | `dduportal/bats`                                       |
 | `testFramework.tag`                       | `test-framework` image tag.                    | `0.4.0`                                                |
-| `testFramework.securityContext`           | `test-framework securityContext                | `{}`                                                   |
+| `testFramework.securityContext`           | `test-framework` securityContext                | `{}`                                                   |
+| `downloadDashboards.env`                  | Environment variables to be passed to the `download-dashboards` container | `{}`                                                   |
 
 
 ### Example of extraVolumeMounts

stable/grafana/templates/deployment.yaml

@@ -77,6 +77,11 @@ spec:
           imagePullPolicy: {{ .Values.downloadDashboardsImage.pullPolicy }}
           command: ["/bin/sh"]
           args: [ "-c", "mkdir -p /var/lib/grafana/dashboards/default && /bin/sh /etc/grafana/download_dashboards.sh" ]
+          env:
+{{- range $key, $value := .Values.downloadDashboards.env }}
+            - name: "{{ $key }}"
+              value: "{{ $value }}"
+{{- end }}
           volumeMounts:
             - name: config
               mountPath: "/etc/grafana/download_dashboards.sh"

stable/grafana/values.yaml

@@ -75,6 +75,9 @@ downloadDashboardsImage:
   tag: latest
   pullPolicy: IfNotPresent
 
+downloadDashboards:
+  env: {}
+
 ## Pod Annotations
 # podAnnotations: {}