diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 478e96f83d..816ef55f5c 100755 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,5 +1,5 @@ name: grafana -version: 1.9.1 +version: 1.10.0 appVersion: 5.1.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/README.md b/stable/grafana/README.md index b269ce76a3..cf26078d0d 100644 --- a/stable/grafana/README.md +++ b/stable/grafana/README.md @@ -59,6 +59,7 @@ The command removes all the Kubernetes components associated with the chart and | `schedulerName` | Alternate scheduler name | `nil` | | `env` | Extra environment variables passed to pods | `{}` | | `envFromSecret` | The name of a Kubenretes secret (must be manually created in the same namespace) containing values to be added to the environment | `""` | +| `extraSecretMounts` | Additional grafana server secret mounts | `[]` | | `datasource` | Configure grafana datasources | `{}` | | `dashboardProviders` | Configure grafana dashboard providers | `{}` | | `dashboards` | Dashboards to import | `{}` | diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml index a8371bfd5c..4fd119235a 100644 --- a/stable/grafana/templates/deployment.yaml +++ b/stable/grafana/templates/deployment.yaml @@ -46,6 +46,11 @@ spec: - name: storage mountPath: "/var/lib/grafana" subPath: {{ .Values.persistence.subPath }} + {{- range .Values.extraSecretMounts }} + - name: {{ .name }} + mountPath: {{ .mountPath }} + readOnly: {{ .readOnly }} + {{- end }} {{- end }} {{- if .Values.image.pullSecrets }} imagePullSecrets: @@ -182,4 +187,9 @@ spec: {{- else }} emptyDir: {} {{- end -}} + {{- range .Values.extraSecretMounts }} + - name: {{ .name }} + secret: + secretName: {{ .secretName }} + {{- end }} diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml index e6697bc386..34d26bbbe8 100644 --- a/stable/grafana/values.yaml +++ b/stable/grafana/values.yaml @@ -107,6 +107,14 @@ env: {} ## This can be useful for auth tokens, etc envFromSecret: "" +## Additional grafana server secret mounts +# Defines additional mounts with secrets. Secrets must be manually created in the namespace. +extraSecretMounts: [] + # - name: secret-files + # mountPath: /etc/secrets + # secretName: grafana-secret-files + # readOnly: true + # Pass the plugins you want installed as a comma separated list. # plugins: "digrich-bubblechart-panel,grafana-clock-panel" plugins: ""