Skip to content

[Chart] Fix rendering condition of "git_sync_ssh_key_volume" #59418

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 4 commits into from
Dec 17, 2025
Merged

[Chart] Fix rendering condition of "git_sync_ssh_key_volume" #59418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b9fef9
fix: fix rendering condition of "git_sync_ssh_key_volume"
zezaeoh Dec 15, 2025
092695c
test: add test case
zezaeoh Dec 16, 2025
6c62a03
test: split the case
zezaeoh Dec 16, 2025
a89a655
Merge branch 'main' into main
zezaeoh Dec 17, 2025
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
2 changes: 1 addition & 1 deletion 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 @@ -252,7 +252,7 @@ spec:
- emptyDir: {{- toYaml (default (dict) .Values.logs.emptyDirConfig) | nindent 6 }}
name: logs
{{- end }}
{{- if and .Values.dags.gitSync.enabled .Values.dags.gitSync.sshKeySecret }}
{{- if and .Values.dags.gitSync.enabled (or .Values.dags.gitSync.sshKeySecret .Values.dags.gitSync.sshKey) }}
{{- include "git_sync_ssh_key_volume" . | nindent 2 }}
{{- end }}
- configMap:
Expand Down
46 changes: 46 additions & 0 deletions helm-tests/tests/helm_tests/airflow_aux/test_configmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,52 @@ def test_execution_api_server_url(
"execution_api_server_url should not be set for Airflow 2.x versions"
)

@pytest.mark.parametrize(
("git_sync_enabled", "ssh_key_secret", "expected_volume"),
[
(True, "my-secret", True),
(True, None, False),
(False, "my-secret", False),
],
)
def test_pod_template_git_sync_ssh_key_volume_with_ssh_key_secret_name(
self, git_sync_enabled, ssh_key_secret, expected_volume
):
dag_values = {"gitSync": {"enabled": git_sync_enabled, "sshKeySecret": ssh_key_secret}}
docs = render_chart(
values={
"executor": "KubernetesExecutor",
"dags": dag_values,
},
show_only=["templates/configmaps/configmap.yaml"],
)

pod_template_file = jmespath.search('data."pod_template_file.yaml"', docs[0])
assert ("git-sync-ssh-key" in pod_template_file) == expected_volume

@pytest.mark.parametrize(
("git_sync_enabled", "ssh_key", "expected_volume"),
[
(True, "my-key", True),
(True, None, False),
(False, "my-key", False),
],
)
def test_pod_template_git_sync_ssh_key_volume_with_ssh_key(
self, git_sync_enabled, ssh_key, expected_volume
):
dag_values = {"gitSync": {"enabled": git_sync_enabled, "sshKey": ssh_key}}
docs = render_chart(
values={
"executor": "KubernetesExecutor",
"dags": dag_values,
},
show_only=["templates/configmaps/configmap.yaml"],
)

pod_template_file = jmespath.search('data."pod_template_file.yaml"', docs[0])
assert ("git-sync-ssh-key" in pod_template_file) == expected_volume

@pytest.mark.parametrize(
("scheduler_cpu_limit", "expected_sync_parallelism"),
[
Expand Down