openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Grafana: Add support for arbitrary environment variables"

Browse Source
This commit is contained in:
Zuul 2019-11-21 20:47:47 +00:00 committed by Gerrit Code Review
commit 7a8fbb17d1
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grafana/templates/deployment.yaml
View File

@ -83,6 +83,9 @@ spec:
key: GRAFANA_ADMIN_PASSWORD key: GRAFANA_ADMIN_PASSWORD
- name: PROMETHEUS_URL - name: PROMETHEUS_URL
value: {{ tuple "monitoring" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} 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: volumeMounts:
- name: pod-tmp - name: pod-tmp
mountPath: /tmp mountPath: /tmp

2
grafana/values.yaml
View File

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