Support templates in ingress host (#121)

localstack · May 28, 2024 · f562712 · f562712
1 parent 8308a20
commit f562712
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/charts/localstack/templates/NOTES.txt b/charts/localstack/templates/NOTES.txt
@@ -2,7 +2,7 @@
 {{- if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ (tpl $host.host $) }}{{ .path }}
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}

diff --git a/charts/localstack/templates/ingress.yaml b/charts/localstack/templates/ingress.yaml
@@ -30,14 +30,14 @@ spec:
   {{- range .Values.ingress.tls }}
     - hosts:
       {{- range .hosts }}
-        - {{ . | quote }}
+        - {{ tpl . $ | quote }}
       {{- end }}
       secretName: {{ .secretName }}
   {{- end }}
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
+    - host: {{ tpl .host $ | quote }}
       http:
         paths:
           {{- range .paths }}

diff --git a/charts/localstack/test-values.yaml b/charts/localstack/test-values.yaml
@@ -28,6 +28,15 @@ mountDind:
   forceTLS: true
 
 
+ingressHost: chart-example.local
+ingress:
+  enabled: true
+  hosts:
+    - host: "{{ .Values.ingressHost }}"
+      paths:
+      - path: /
+        pathType: ImplementationSpecific
+
 # enable localstack pro (don't forget to set your API key)
 # image:
 #   repository: localstack/localstack-pro