Skip to content
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

Jump to bottom

Only mount DAGs in webserver when required #16229

Merged
merged 1 commit into from
Jun 3, 2021
Merged

Only mount DAGs in webserver when required #16229

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions chart/templates/webserver/webserver-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ spec:
subPath: airflow_local_settings.py
readOnly: true
{{- end }}
{{- if or (and .Values.dags.gitSync.enabled (semverCompare "<2.0.0" .Values.airflowVersion)) .Values.dags.persistence.enabled }}
{{- if and (semverCompare "<2.0.0" .Values.airflowVersion) (or .Values.dags.gitSync.enabled .Values.dags.persistence.enabled) }}
{{- include "airflow_dags_mount" . | nindent 12 }}
{{- end }}
{{- if .Values.logs.persistence.enabled }}
Expand Down Expand Up @@ -198,17 +198,19 @@ spec:
configMap:
name: {{ .Release.Name }}-webserver-config
{{- end }}
{{- if (semverCompare "<2.0.0" .Values.airflowVersion) }}
{{- if .Values.dags.persistence.enabled }}
- name: dags
persistentVolumeClaim:
claimName: {{ template "airflow_dags_volume_claim" . }}
{{- else if and (.Values.dags.gitSync.enabled) (semverCompare "<2.0.0" .Values.airflowVersion) }}
{{- else if .Values.dags.gitSync.enabled }}
- name: dags
emptyDir: {}
{{- if .Values.dags.gitSync.sshKeySecret }}
{{- include "git_sync_ssh_key_volume" . | indent 8 }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.logs.persistence.enabled }}
- name: logs
persistentVolumeClaim:
Expand Down
72 changes: 72 additions & 0 deletions chart/tests/test_webserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,78 @@ def test_command_and_args_overrides_are_templated(self):
assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])

@parameterized.expand(
[
("1.10.15", {"gitSync": {"enabled": False}}),
("1.10.15", {"persistence": {"enabled": False}}),
("1.10.15", {"gitSync": {"enabled": False}, "persistence": {"enabled": False}}),
("2.0.0", {"gitSync": {"enabled": True}}),
("2.0.0", {"gitSync": {"enabled": False}}),
("2.0.0", {"persistence": {"enabled": True}}),
("2.0.0", {"persistence": {"enabled": False}}),
("2.0.0", {"gitSync": {"enabled": True}, "persistence": {"enabled": True}}),
]
)
def test_no_dags_mount_or_volume_or_gitsync_sidecar_expected(self, airflow_version, dag_values):
docs = render_chart(
values={"dags": dag_values, "airflowVersion": airflow_version},
show_only=["templates/webserver/webserver-deployment.yaml"],
)

assert "dags" not in [
vm["name"] for vm in jmespath.search("spec.template.spec.containers[0].volumeMounts", docs[0])
]
assert "dags" not in [vm["name"] for vm in jmespath.search("spec.template.spec.volumes", docs[0])]
assert 1 == len(jmespath.search("spec.template.spec.containers", docs[0]))

@parameterized.expand(
[
("1.10.15", {"gitSync": {"enabled": True}}, True),
("1.10.15", {"persistence": {"enabled": True}}, False),
("1.10.15", {"gitSync": {"enabled": True}, "persistence": {"enabled": True}}, True),
]
)
def test_dags_mount(self, airflow_version, dag_values, expected_read_only):
docs = render_chart(
values={"dags": dag_values, "airflowVersion": airflow_version},
show_only=["templates/webserver/webserver-deployment.yaml"],
)

assert {
"mountPath": "/opt/airflow/dags",
"name": "dags",
"readOnly": expected_read_only,
} in jmespath.search("spec.template.spec.containers[0].volumeMounts", docs[0])

def test_dags_gitsync_volume_and_sidecar(self):
docs = render_chart(
values={"dags": {"gitSync": {"enabled": True}}, "airflowVersion": "1.10.15"},
show_only=["templates/webserver/webserver-deployment.yaml"],
)

assert {"name": "dags", "emptyDir": {}} in jmespath.search("spec.template.spec.volumes", docs[0])
assert "git-sync" in [c["name"] for c in jmespath.search("spec.template.spec.containers", docs[0])]

@parameterized.expand(
[
({"persistence": {"enabled": True}}, "RELEASE-NAME-dags"),
({"persistence": {"enabled": True, "existingClaim": "test-claim"}}, "test-claim"),
({"persistence": {"enabled": True}, "gitSync": {"enabled": True}}, "RELEASE-NAME-dags"),
]
)
def test_dags_persistence_volume_no_sidecar(self, dags_values, expected_claim_name):
docs = render_chart(
values={"dags": dags_values, "airflowVersion": "1.10.15"},
show_only=["templates/webserver/webserver-deployment.yaml"],
)

assert {
"name": "dags",
"persistentVolumeClaim": {"claimName": expected_claim_name},
} in jmespath.search("spec.template.spec.volumes", docs[0])
# No gitsync sidecar
assert 1 == len(jmespath.search("spec.template.spec.containers", docs[0]))


class WebserverServiceTest(unittest.TestCase):
def test_default_service(self):
Expand Down