Skip to content

Chart: template dagprocessor waitformigrations extraVolumeMounts #32100

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 3 commits into from
Jun 27, 2023
Merged

Chart: template dagprocessor waitformigrations extraVolumeMounts #32100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3dae3f
Chart: template dagprocessor waitformigrations extraVolumeMounts
Aakcht Jun 23, 2023
2fd7d06
Add tests
Aakcht Jun 24, 2023
db7142a
Merge branch 'main' into template_dag_processor_migration_volumes
jedcunningham Jun 27, 2023
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/templates/dag-processor/dag-processor-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ spec:
{{- toYaml .Values.volumeMounts | nindent 12 }}
{{- end }}
{{- if .Values.dagProcessor.extraVolumeMounts }}
{{- toYaml .Values.dagProcessor.extraVolumeMounts | nindent 12 }}
{{- tpl (toYaml .Values.dagProcessor.extraVolumeMounts) . | nindent 12 }}
{{- end }}
{{- include "airflow_config_mount" . | nindent 12 }}
args: {{- include "wait-for-migrations-command" . | indent 10 }}
Expand Down
8 changes: 4 additions & 4 deletions tests/charts/airflow_aux/test_create_user_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,27 +157,27 @@ def test_should_add_extra_volumes(self):
docs = render_chart(
values={
"createUserJob": {
"extraVolumes": [{"name": "myvolume", "emptyDir": {}}],
"extraVolumes": [{"name": "myvolume-{{ .Chart.Name }}", "emptyDir": {}}],
},
},
show_only=["templates/jobs/create-user-job.yaml"],
)

assert {"name": "myvolume", "emptyDir": {}} == jmespath.search(
assert {"name": "myvolume-airflow", "emptyDir": {}} == jmespath.search(
"spec.template.spec.volumes[-1]", docs[0]
)

def test_should_add_extra_volume_mounts(self):
docs = render_chart(
values={
"createUserJob": {
"extraVolumeMounts": [{"name": "foobar", "mountPath": "foo/bar"}],
"extraVolumeMounts": [{"name": "foobar-{{ .Chart.Name }}", "mountPath": "foo/bar"}],
},
},
show_only=["templates/jobs/create-user-job.yaml"],
)

assert {"name": "foobar", "mountPath": "foo/bar"} == jmespath.search(
assert {"name": "foobar-airflow", "mountPath": "foo/bar"} == jmespath.search(
"spec.template.spec.containers[0].volumeMounts[-1]", docs[0]
)

Expand Down
8 changes: 4 additions & 4 deletions tests/charts/airflow_aux/test_migrate_database_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,27 +195,27 @@ def test_should_add_extra_volumes(self):
docs = render_chart(
values={
"migrateDatabaseJob": {
"extraVolumes": [{"name": "myvolume", "emptyDir": {}}],
"extraVolumes": [{"name": "myvolume-{{ .Chart.Name }}", "emptyDir": {}}],
},
},
show_only=["templates/jobs/migrate-database-job.yaml"],
)

assert {"name": "myvolume", "emptyDir": {}} == jmespath.search(
assert {"name": "myvolume-airflow", "emptyDir": {}} == jmespath.search(
"spec.template.spec.volumes[-1]", docs[0]
)

def test_should_add_extra_volume_mounts(self):
docs = render_chart(
values={
"migrateDatabaseJob": {
"extraVolumeMounts": [{"name": "foobar", "mountPath": "foo/bar"}],
"extraVolumeMounts": [{"name": "foobar-{{ .Chart.Name }}", "mountPath": "foo/bar"}],
},
},
show_only=["templates/jobs/migrate-database-job.yaml"],
)

assert {"name": "foobar", "mountPath": "foo/bar"} == jmespath.search(
assert {"name": "foobar-airflow", "mountPath": "foo/bar"} == jmespath.search(
"spec.template.spec.containers[0].volumeMounts[-1]", docs[0]
)

Expand Down
10 changes: 6 additions & 4 deletions tests/charts/airflow_aux/test_pod_template_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,19 +521,21 @@ def test_should_create_valid_volume_mount_and_volume(self):
docs = render_chart(
values={
"workers": {
"extraVolumes": [{"name": "test-volume", "emptyDir": {}}],
"extraVolumeMounts": [{"name": "test-volume", "mountPath": "/opt/test"}],
"extraVolumes": [{"name": "test-volume-{{ .Chart.Name }}", "emptyDir": {}}],
"extraVolumeMounts": [
{"name": "test-volume-{{ .Chart.Name }}", "mountPath": "/opt/test"}
],
}
},
show_only=["templates/pod-template-file.yaml"],
chart_dir=self.temp_chart_dir,
)

assert "test-volume" in jmespath.search(
assert "test-volume-airflow" in jmespath.search(
"spec.volumes[*].name",
docs[0],
)
assert "test-volume" in jmespath.search(
assert "test-volume-airflow" in jmespath.search(
"spec.containers[0].volumeMounts[*].name",
docs[0],
)
Expand Down
12 changes: 7 additions & 5 deletions tests/charts/airflow_core/test_dag_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,20 @@ def test_should_add_extra_volume_and_extra_volume_mount(self):
values={
"dagProcessor": {
"enabled": True,
"extraVolumes": [{"name": "test-volume", "emptyDir": {}}],
"extraVolumeMounts": [{"name": "test-volume", "mountPath": "/opt/test"}],
"extraVolumes": [{"name": "test-volume-{{ .Chart.Name }}", "emptyDir": {}}],
"extraVolumeMounts": [
{"name": "test-volume-{{ .Chart.Name }}", "mountPath": "/opt/test"}
],
},
},
show_only=["templates/dag-processor/dag-processor-deployment.yaml"],
)

assert "test-volume" == jmespath.search("spec.template.spec.volumes[1].name", docs[0])
assert "test-volume" == jmespath.search(
assert "test-volume-airflow" == jmespath.search("spec.template.spec.volumes[1].name", docs[0])
assert "test-volume-airflow" == jmespath.search(
"spec.template.spec.containers[0].volumeMounts[0].name", docs[0]
)
assert "test-volume" == jmespath.search(
assert "test-volume-airflow" == jmespath.search(
"spec.template.spec.initContainers[0].volumeMounts[0].name", docs[0]
)

Expand Down
13 changes: 9 additions & 4 deletions tests/charts/airflow_core/test_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,22 @@ def test_should_add_extra_volume_and_extra_volume_mount(self):
values={
"executor": "CeleryExecutor",
"scheduler": {
"extraVolumes": [{"name": "test-volume", "emptyDir": {}}],
"extraVolumeMounts": [{"name": "test-volume", "mountPath": "/opt/test"}],
"extraVolumes": [{"name": "test-volume-{{ .Chart.Name }}", "emptyDir": {}}],
"extraVolumeMounts": [
{"name": "test-volume-{{ .Chart.Name }}", "mountPath": "/opt/test"}
],
},
},
show_only=["templates/scheduler/scheduler-deployment.yaml"],
)

assert "test-volume" in jmespath.search("spec.template.spec.volumes[*].name", docs[0])
assert "test-volume" in jmespath.search(
assert "test-volume-airflow" in jmespath.search("spec.template.spec.volumes[*].name", docs[0])
assert "test-volume-airflow" in jmespath.search(
"spec.template.spec.containers[0].volumeMounts[*].name", docs[0]
)
assert "test-volume-airflow" == jmespath.search(
"spec.template.spec.initContainers[0].volumeMounts[-1].name", docs[0]
)

def test_should_add_global_volume_and_global_volume_mount(self):
docs = render_chart(
Expand Down
13 changes: 9 additions & 4 deletions tests/charts/airflow_core/test_triggerer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,22 @@ def test_should_add_extra_volume_and_extra_volume_mount(self):
docs = render_chart(
values={
"triggerer": {
"extraVolumes": [{"name": "test-volume", "emptyDir": {}}],
"extraVolumeMounts": [{"name": "test-volume", "mountPath": "/opt/test"}],
"extraVolumes": [{"name": "test-volume-{{ .Chart.Name }}", "emptyDir": {}}],
"extraVolumeMounts": [
{"name": "test-volume-{{ .Chart.Name }}", "mountPath": "/opt/test"}
],
},
},
show_only=["templates/triggerer/triggerer-deployment.yaml"],
)

assert "test-volume" == jmespath.search("spec.template.spec.volumes[1].name", docs[0])
assert "test-volume" == jmespath.search(
assert "test-volume-airflow" == jmespath.search("spec.template.spec.volumes[1].name", docs[0])
assert "test-volume-airflow" == jmespath.search(
"spec.template.spec.containers[0].volumeMounts[0].name", docs[0]
)
assert "test-volume-airflow" == jmespath.search(
"spec.template.spec.initContainers[0].volumeMounts[-1].name", docs[0]
)

def test_should_add_global_volume_and_global_volume_mount(self):
docs = render_chart(
Expand Down
13 changes: 9 additions & 4 deletions tests/charts/airflow_core/test_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,22 @@ def test_should_add_extra_volume_and_extra_volume_mount(self):
values={
"executor": "CeleryExecutor",
"workers": {
"extraVolumes": [{"name": "test-volume", "emptyDir": {}}],
"extraVolumeMounts": [{"name": "test-volume", "mountPath": "/opt/test"}],
"extraVolumes": [{"name": "test-volume-{{ .Chart.Name }}", "emptyDir": {}}],
"extraVolumeMounts": [
{"name": "test-volume-{{ .Chart.Name }}", "mountPath": "/opt/test"}
],
},
},
show_only=["templates/workers/worker-deployment.yaml"],
)

assert "test-volume" == jmespath.search("spec.template.spec.volumes[0].name", docs[0])
assert "test-volume" == jmespath.search(
assert "test-volume-airflow" == jmespath.search("spec.template.spec.volumes[0].name", docs[0])
assert "test-volume-airflow" == jmespath.search(
"spec.template.spec.containers[0].volumeMounts[0].name", docs[0]
)
assert "test-volume-airflow" == jmespath.search(
"spec.template.spec.initContainers[0].volumeMounts[-1].name", docs[0]
)

def test_should_add_global_volume_and_global_volume_mount(self):
docs = render_chart(
Expand Down
10 changes: 6 additions & 4 deletions tests/charts/other/test_flower.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,15 +256,17 @@ def test_should_add_extra_volume_and_extra_volume_mount(self):
values={
"flower": {
"enabled": True,
"extraVolumes": [{"name": "myvolume", "emptyDir": {}}],
"extraVolumeMounts": [{"name": "myvolume", "mountPath": "/opt/test"}],
"extraVolumes": [{"name": "myvolume-{{ .Chart.Name }}", "emptyDir": {}}],
"extraVolumeMounts": [{"name": "myvolume-{{ .Chart.Name }}", "mountPath": "/opt/test"}],
},
},
show_only=["templates/flower/flower-deployment.yaml"],
)

assert {"name": "myvolume", "emptyDir": {}} in jmespath.search("spec.template.spec.volumes", docs[0])
assert {"name": "myvolume", "mountPath": "/opt/test"} in jmespath.search(
assert {"name": "myvolume-airflow", "emptyDir": {}} in jmespath.search(
"spec.template.spec.volumes", docs[0]
)
assert {"name": "myvolume-airflow", "mountPath": "/opt/test"} in jmespath.search(
"spec.template.spec.containers[0].volumeMounts", docs[0]
)

Expand Down
20 changes: 12 additions & 8 deletions tests/charts/other/test_git_sync_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,10 @@ def test_should_add_extra_volume_and_extra_volume_mount(self):
values={
"executor": "CeleryExecutor",
"scheduler": {
"extraVolumes": [{"name": "test-volume", "emptyDir": {}}],
"extraVolumeMounts": [{"name": "test-volume", "mountPath": "/opt/test"}],
"extraVolumes": [{"name": "test-volume-{{ .Chart.Name }}", "emptyDir": {}}],
"extraVolumeMounts": [
{"name": "test-volume-{{ .Chart.Name }}", "mountPath": "/opt/test"}
],
},
"dags": {
"gitSync": {
Expand All @@ -198,10 +200,10 @@ def test_should_add_extra_volume_and_extra_volume_mount(self):
show_only=["templates/scheduler/scheduler-deployment.yaml"],
)

assert {"name": "test-volume", "emptyDir": {}} in jmespath.search(
assert {"name": "test-volume-airflow", "emptyDir": {}} in jmespath.search(
"spec.template.spec.volumes", docs[0]
)
assert {"name": "test-volume", "mountPath": "/opt/test"} in jmespath.search(
assert {"name": "test-volume-airflow", "mountPath": "/opt/test"} in jmespath.search(
"spec.template.spec.containers[0].volumeMounts", docs[0]
)

Expand All @@ -210,25 +212,27 @@ def test_extra_volume_and_git_sync_extra_volume_mount(self):
values={
"executor": "CeleryExecutor",
"scheduler": {
"extraVolumes": [{"name": "test-volume", "emptyDir": {}}],
"extraVolumes": [{"name": "test-volume-{{ .Values.executor }}", "emptyDir": {}}],
},
"dags": {
"gitSync": {
"enabled": True,
"extraVolumeMounts": [{"mountPath": "/opt/test", "name": "test-volume"}],
"extraVolumeMounts": [
{"mountPath": "/opt/test", "name": "test-volume-{{ .Values.executor }}"}
],
}
},
},
show_only=["templates/scheduler/scheduler-deployment.yaml"],
)

assert {"name": "test-volume", "emptyDir": {}} in jmespath.search(
assert {"name": "test-volume-CeleryExecutor", "emptyDir": {}} in jmespath.search(
"spec.template.spec.volumes", docs[0]
)
assert {"mountPath": "/git", "name": "dags"} in jmespath.search(
"spec.template.spec.containers[1].volumeMounts", docs[0]
)
assert {"name": "test-volume", "mountPath": "/opt/test"} in jmespath.search(
assert {"name": "test-volume-CeleryExecutor", "mountPath": "/opt/test"} in jmespath.search(
"spec.template.spec.containers[1].volumeMounts", docs[0]
)

Expand Down
11 changes: 7 additions & 4 deletions tests/charts/other/test_pgbouncer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,22 +288,25 @@ def test_should_add_extra_volume_and_extra_volume_mount(self):
"enabled": True,
"extraVolumes": [
{
"name": "pgbouncer-client-certificates",
"name": "pgbouncer-client-certificates-{{ .Chart.Name }}",
"secret": {"secretName": "pgbouncer-client-tls-certificate"},
}
],
"extraVolumeMounts": [
{"name": "pgbouncer-client-certificates", "mountPath": "/etc/pgbouncer/certs"}
{
"name": "pgbouncer-client-certificates-{{ .Chart.Name }}",
"mountPath": "/etc/pgbouncer/certs",
}
],
},
},
show_only=["templates/pgbouncer/pgbouncer-deployment.yaml"],
)

assert "pgbouncer-client-certificates" in jmespath.search(
assert "pgbouncer-client-certificates-airflow" in jmespath.search(
"spec.template.spec.volumes[*].name", docs[0]
)
assert "pgbouncer-client-certificates" in jmespath.search(
assert "pgbouncer-client-certificates-airflow" in jmespath.search(
"spec.template.spec.containers[0].volumeMounts[*].name", docs[0]
)

Expand Down
13 changes: 9 additions & 4 deletions tests/charts/webserver/test_webserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,22 @@ def test_should_add_extra_volume_and_extra_volume_mount(self):
docs = render_chart(
values={
"webserver": {
"extraVolumes": [{"name": "test-volume", "emptyDir": {}}],
"extraVolumeMounts": [{"name": "test-volume", "mountPath": "/opt/test"}],
"extraVolumes": [{"name": "test-volume-{{ .Chart.Name }}", "emptyDir": {}}],
"extraVolumeMounts": [
{"name": "test-volume-{{ .Chart.Name }}", "mountPath": "/opt/test"}
],
},
},
show_only=["templates/webserver/webserver-deployment.yaml"],
)

assert "test-volume" == jmespath.search("spec.template.spec.volumes[-1].name", docs[0])
assert "test-volume" == jmespath.search(
assert "test-volume-airflow" == jmespath.search("spec.template.spec.volumes[-1].name", docs[0])
assert "test-volume-airflow" == jmespath.search(
"spec.template.spec.containers[0].volumeMounts[-1].name", docs[0]
)
assert "test-volume-airflow" == jmespath.search(
"spec.template.spec.initContainers[0].volumeMounts[-1].name", docs[0]
)

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