[grafana] tpl for host in grafana.ini (#3127)

grafana · Aug 10, 2024 · a555f7c · a555f7c
1 parent bdd047d
commit a555f7c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.4.3
+version: 8.4.4
 appVersion: 11.1.3
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/charts/grafana/ci/with-nondefault-values.yaml b/charts/grafana/ci/with-nondefault-values.yaml
@@ -0,0 +1,6 @@
+global:
+  environment: prod
+ingress:
+  enabled: true
+  hosts:
+    - monitoring-{{ .Values.global.environment }}.example.com
diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
@@ -797,7 +797,7 @@ grafana.ini:
   grafana_net:
     url: https://grafana.net
   server:
-    domain: "{{ if (and .Values.ingress.enabled .Values.ingress.hosts) }}{{ .Values.ingress.hosts | first }}{{ else }}''{{ end }}"
+    domain: "{{ if (and .Values.ingress.enabled .Values.ingress.hosts) }}{{ tpl (.Values.ingress.hosts | first) . }}{{ else }}''{{ end }}"
 ## grafana Authentication can be enabled with the following values on grafana.ini
  # server:
       # The full public facing url you use in browser, used for redirects and emails