Merge "Grafana: Add support for arbitrary environment variables"

grafana/templates/deployment.yaml

@@ -83,6 +83,9 @@ spec:
                   key: GRAFANA_ADMIN_PASSWORD
             - name: PROMETHEUS_URL
               value: {{ tuple "monitoring" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
+{{- if .Values.pod.env.grafana }}
+{{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.pod.env.grafana | indent 12 }}
+{{- end }}
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp

grafana/values.yaml

@@ -43,6 +43,8 @@ labels:
     node_selector_value: enabled
 
 pod:
+  env:
+    grafana: null
   security_context:
     dashboard:
       pod: