From 8203cb999001fe7bd5dc8890b97f1fbaa0ffd980 Mon Sep 17 00:00:00 2001
From: Dylan Piergies <dylan.piergies@gmail.com>
Date: Wed, 3 May 2023 07:27:17 +0100
Subject: [PATCH] helm: apply templating to Ingress host and environment
 variable values (#17073)

---
 helm/minio/templates/console-ingress.yaml | 2 +-
 helm/minio/templates/deployment.yaml      | 2 +-
 helm/minio/templates/ingress.yaml         | 2 +-
 helm/minio/templates/statefulset.yaml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/helm/minio/templates/console-ingress.yaml b/helm/minio/templates/console-ingress.yaml
index 3df9242df..79a2b1b58 100644
--- a/helm/minio/templates/console-ingress.yaml
+++ b/helm/minio/templates/console-ingress.yaml
@@ -49,7 +49,7 @@ spec:
               servicePort: {{ $servicePort }}
             {{- end }}
       {{- if . }}
-      host: {{ . | quote }}
+      host: {{ tpl . $ | quote }}
       {{- end }}
     {{- end }}
 {{- end }}
diff --git a/helm/minio/templates/deployment.yaml b/helm/minio/templates/deployment.yaml
index 435ad1c4e..dee53cddd 100644
--- a/helm/minio/templates/deployment.yaml
+++ b/helm/minio/templates/deployment.yaml
@@ -154,7 +154,7 @@ spec:
             {{- end }}
             {{- range $key, $val := .Values.environment }}
             - name: {{ $key }}
-              value: {{ $val | quote }}
+              value: {{ tpl $val $ | quote }}
             {{- end }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
         {{- with .Values.extraContainers }}
diff --git a/helm/minio/templates/ingress.yaml b/helm/minio/templates/ingress.yaml
index d27be6ecc..1a564c6bc 100644
--- a/helm/minio/templates/ingress.yaml
+++ b/helm/minio/templates/ingress.yaml
@@ -49,7 +49,7 @@ spec:
               servicePort: {{ $servicePort }}
             {{- end }}
       {{- if . }}
-      host: {{ . | quote }}
+      host: {{ tpl . $ | quote }}
       {{- end }}
     {{- end }}
 {{- end }}
diff --git a/helm/minio/templates/statefulset.yaml b/helm/minio/templates/statefulset.yaml
index e4fbae7ac..21a3e60f9 100644
--- a/helm/minio/templates/statefulset.yaml
+++ b/helm/minio/templates/statefulset.yaml
@@ -172,7 +172,7 @@ spec:
             {{- end }}
             {{- range $key, $val := .Values.environment }}
             - name: {{ $key }}
-              value: {{ $val | quote }}
+              value: {{ tpl $val $ | quote }}
             {{- end }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
         {{- with .Values.extraContainers }}