Skip to content

fix: Add api-server support for k8s pod template #53533

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
potiuk merged 1 commit into from
Sep 6, 2025
Merged

fix: Add api-server support for k8s pod template #53533

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
30 changes: 25 additions & 5 deletions chart/files/pod-template-file.kubernetes-helm-yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,14 @@ spec:
{{- if .Values.workers.extraVolumeMounts }}
{{- tpl (toYaml .Values.workers.extraVolumeMounts) . | nindent 8 }}
{{- end }}
{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
{{- include "airflow_webserver_config_mount" . | nindent 8 }}
{{- if semverCompare ">=3.0.0" .Values.airflowVersion }}
{{- if or .Values.apiServer.apiServerConfig .Values.apiServer.apiServerConfigConfigMapName }}
{{- include "airflow_api_server_config_mount" . | nindent 8 }}
{{- end }}
{{- else }}
{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
{{- include "airflow_webserver_config_mount" . | nindent 8 }}
{{- end }}
{{- end }}
envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 6 }}
env:
Expand Down Expand Up @@ -183,8 +189,14 @@ spec:
{{- if .Values.workers.extraVolumeMounts }}
{{- tpl (toYaml .Values.workers.extraVolumeMounts) . | nindent 8 }}
{{- end }}
{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
{{- include "airflow_webserver_config_mount" . | nindent 8 }}
{{- if semverCompare ">=3.0.0" .Values.airflowVersion }}
{{- if or .Values.apiServer.apiServerConfig .Values.apiServer.apiServerConfigConfigMapName }}
{{- include "airflow_api_server_config_mount" . | nindent 8 }}
{{- end }}
{{- else }}
{{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
{{- include "airflow_webserver_config_mount" . | nindent 8 }}
{{- end }}
{{- end }}
envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 6 }}
env:
Expand Down Expand Up @@ -249,10 +261,18 @@ spec:
- configMap:
name: {{ include "airflow_config" . }}
name: config
{{- if and (or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName) (or .Values.workers.kerberosInitContainer.enabled .Values.workers.kerberosSidecar.enabled)}}
{{- if semverCompare ">=3.0.0" .Values.airflowVersion }}
{{- if and (or .Values.apiServer.apiServerConfig .Values.apiServer.apiServerConfigConfigMapName) (or .Values.workers.kerberosInitContainer.enabled .Values.workers.kerberosSidecar.enabled)}}
- name: api-server-config
configMap:
name: {{ template "airflow_api_server_config_configmap_name" . }}
{{- end }}
{{- else }}
{{- if and (or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName) (or .Values.workers.kerberosInitContainer.enabled .Values.workers.kerberosSidecar.enabled)}}
- name: webserver-config
configMap:
name: {{ template "airflow_webserver_config_configmap_name" . }}
{{- end }}
{{- end }}
{{- if .Values.volumes }}
{{- toYaml .Values.volumes | nindent 2 }}
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/_helpers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ server_tls_key_file = /etc/pgbouncer/server.key
{{- end }}

{{- define "airflow_api_server_config_configmap_name" -}}
{{- default (printf "%s-api-server-config" .Release.Name) .Values.webserver.webserverConfigConfigMapName }}
{{- default (printf "%s-api-server-config" .Release.Name) .Values.apiServer.apiServerConfigConfigMapName }}
{{- end }}

{{- define "airflow_api_server_config_mount" -}}
Expand Down
26 changes: 19 additions & 7 deletions helm-tests/tests/helm_tests/airflow_aux/test_pod_template_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,15 +1065,27 @@ def test_should_not_add_command_by_default(self):
assert jmespath.search("spec.containers[0].command", docs[0]) is None

@pytest.mark.parametrize(
"workers_values, kerberos_init_container",
"airflow_version, workers_values, kerberos_init_container, expected_config_name",
[
({"kerberosSidecar": {"enabled": True}}, False),
({"kerberosInitContainer": {"enabled": True}}, True),
(None, {"kerberosSidecar": {"enabled": True}}, False, "api-server-config"),
(None, {"kerberosInitContainer": {"enabled": True}}, True, "api-server-config"),
("2.10.5", {"kerberosSidecar": {"enabled": True}}, False, "webserver-config"),
("2.10.5", {"kerberosInitContainer": {"enabled": True}}, True, "webserver-config"),
],
)
def test_webserver_config_for_kerberos(self, workers_values, kerberos_init_container):
def test_webserver_config_for_kerberos(
self, airflow_version, workers_values, kerberos_init_container, expected_config_name
):
values = {
"airflowVersion": airflow_version,
"workers": workers_values,
"apiServer": {"apiServerConfigConfigMapName": "config"},
"webserver": {"webserverConfigConfigMapName": "config"},
}
if airflow_version is None:
del values["airflowVersion"]
docs = render_chart(
values={"workers": workers_values, "webserver": {"webserverConfigConfigMapName": "config"}},
values=values,
show_only=["templates/pod-template-file.yaml"],
chart_dir=self.temp_chart_dir,
)
Expand All @@ -1084,8 +1096,8 @@ def test_webserver_config_for_kerberos(self, workers_values, kerberos_init_conta

volume_mounts_names = jmespath.search(kerberos_container, docs[0])
print(volume_mounts_names)
assert "webserver-config" in volume_mounts_names
assert "webserver-config" in jmespath.search("spec.volumes[*].name", docs[0])
assert expected_config_name in volume_mounts_names
assert expected_config_name in jmespath.search("spec.volumes[*].name", docs[0])

@pytest.mark.parametrize(
"workers_values",
Expand Down