Skip to content

Fix tpl rendering for TLS hosts in ingress templates #62358 #62548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jscheffl merged 1 commit into from
Mar 1, 2026
Merged

Fix tpl rendering for TLS hosts in ingress templates #62358 #62548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions chart/templates/api-server/api-server-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
{{- if .tls }}
{{- if .tls.enabled }}
- hosts:
- {{ .name | quote }}
- {{ tpl .name $ | quote }}
secretName: {{ .tls.secretName }}
{{- end }}
{{- end }}
Expand All @@ -64,7 +64,9 @@ spec:
{{- else if .Values.ingress.apiServer.tls.enabled }}
tls:
- hosts:
{{- .Values.ingress.apiServer.hosts | default (list .Values.ingress.apiServer.host) | toYaml | nindent 8 }}
{{- range .Values.ingress.apiServer.hosts | default (list .Values.ingress.apiServer.host) }}
- {{ tpl . $ | quote }}
{{- end }}
secretName: {{ .Values.ingress.apiServer.tls.secretName }}
{{- end }}
rules:
Expand Down
6 changes: 4 additions & 2 deletions chart/templates/flower/flower-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
{{- if .tls }}
{{- if .tls.enabled }}
- hosts:
- {{ .name | quote }}
- {{ tpl .name $ | quote }}
secretName: {{ .tls.secretName }}
{{- end }}
{{- end }}
Expand All @@ -64,7 +64,9 @@ spec:
{{- else if .Values.ingress.flower.tls.enabled }}
tls:
- hosts:
{{- .Values.ingress.flower.hosts | default (list .Values.ingress.flower.host) | toYaml | nindent 8 }}
{{- range .Values.ingress.flower.hosts | default (list .Values.ingress.flower.host) }}
- {{ tpl . $ | quote }}
{{- end }}
secretName: {{ .Values.ingress.flower.tls.secretName }}
{{- end }}
rules:
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/pgbouncer/pgbouncer-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
{{- if .tls }}
{{- if .tls.enabled }}
- hosts:
- {{ .name | quote }}
- {{ tpl .name $ | quote }}
secretName: {{ .tls.secretName }}
{{- end }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/statsd/statsd-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
{{- if .tls }}
{{- if .tls.enabled }}
- hosts:
- {{ .name | quote }}
- {{ tpl .name $ | quote }}
secretName: {{ .tls.secretName }}
{{- end }}
{{- end }}
Expand Down
6 changes: 4 additions & 2 deletions chart/templates/webserver/webserver-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
{{- if .tls }}
{{- if .tls.enabled }}
- hosts:
- {{ .name | quote }}
- {{ tpl .name $ | quote }}
secretName: {{ .tls.secretName }}
{{- end }}
{{- end }}
Expand All @@ -64,7 +64,9 @@ spec:
{{- else if .Values.ingress.web.tls.enabled }}
tls:
- hosts:
{{- .Values.ingress.web.hosts | default (list .Values.ingress.web.host) | toYaml | nindent 8 }}
{{- range .Values.ingress.web.hosts | default (list .Values.ingress.web.host) }}
- {{ tpl . $ | quote }}
{{- end }}
secretName: {{ .Values.ingress.web.tls.secretName }}
{{- end }}
rules:
Expand Down
14 changes: 12 additions & 2 deletions helm-tests/tests/helm_tests/apiserver/test_ingress_apiserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,14 @@ def test_can_ingress_hosts_be_templated(self):
"apiServer": {
"enabled": True,
"hosts": [
{"name": "*.{{ .Release.Namespace }}.example.com"},
{"name": "{{ .Values.testValues.scalar }}.example.com"},
{
"name": "*.{{ .Release.Namespace }}.example.com",
"tls": {"enabled": True, "secretName": "secret1"},
},
{
"name": "{{ .Values.testValues.scalar }}.example.com",
"tls": {"enabled": True, "secretName": "secret2"},
},
{"name": "{{ index .Values.testValues.list 1 }}.example.com"},
{"name": "{{ .Values.testValues.dict.key }}.example.com"},
],
Expand All @@ -208,6 +214,10 @@ def test_can_ingress_hosts_be_templated(self):
"cc.example.com",
"dd.example.com",
]
assert jmespath.search("spec.tls[*]", docs[0]) == [
{"hosts": ["*.airflow.example.com"], "secretName": "secret1"},
{"hosts": ["aa.example.com"], "secretName": "secret2"},
]

def test_backend_service_name(self):
docs = render_chart(
Expand Down
14 changes: 12 additions & 2 deletions helm-tests/tests/helm_tests/webserver/test_ingress_flower.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,14 @@ def test_can_ingress_hosts_be_templated(self):
"flower": {
"enabled": True,
"hosts": [
{"name": "*.{{ .Release.Namespace }}.example.com"},
{"name": "{{ .Values.testValues.scalar }}.example.com"},
{
"name": "*.{{ .Release.Namespace }}.example.com",
"tls": {"enabled": True, "secretName": "secret1"},
},
{
"name": "{{ .Values.testValues.scalar }}.example.com",
"tls": {"enabled": True, "secretName": "secret2"},
},
{"name": "{{ index .Values.testValues.list 1 }}.example.com"},
{"name": "{{ .Values.testValues.dict.key }}.example.com"},
],
Expand All @@ -216,6 +222,10 @@ def test_can_ingress_hosts_be_templated(self):
"cc.example.com",
"dd.example.com",
]
assert jmespath.search("spec.tls[*]", docs[0]) == [
{"hosts": ["*.airflow.example.com"], "secretName": "secret1"},
{"hosts": ["aa.example.com"], "secretName": "secret2"},
]

def test_backend_service_name(self):
docs = render_chart(
Expand Down
14 changes: 12 additions & 2 deletions helm-tests/tests/helm_tests/webserver/test_ingress_web.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,14 @@ def test_can_ingress_hosts_be_templated(self):
"web": {
"enabled": True,
"hosts": [
{"name": "*.{{ .Release.Namespace }}.example.com"},
{"name": "{{ .Values.testValues.scalar }}.example.com"},
{
"name": "*.{{ .Release.Namespace }}.example.com",
"tls": {"enabled": True, "secretName": "secret1"},
},
{
"name": "{{ .Values.testValues.scalar }}.example.com",
"tls": {"enabled": True, "secretName": "secret2"},
},
{"name": "{{ index .Values.testValues.list 1 }}.example.com"},
{"name": "{{ .Values.testValues.dict.key }}.example.com"},
],
Expand All @@ -208,6 +214,10 @@ def test_can_ingress_hosts_be_templated(self):
"cc.example.com",
"dd.example.com",
]
assert jmespath.search("spec.tls[*]", docs[0]) == [
{"hosts": ["*.airflow.example.com"], "secretName": "secret1"},
{"hosts": ["aa.example.com"], "secretName": "secret2"},
]

def test_backend_service_name(self):
docs = render_chart(
Expand Down