Skip to content

Add worker service account for LocalKubernetesExecutor #28813

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
jedcunningham merged 2 commits into from
Jan 10, 2023
Merged

Add worker service account for LocalKubernetesExecutor #28813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1795a3e
add service account for localkubernetesexecutor
Jan 9, 2023
5ab6286
add test for worker service account
Chen-Oliver Jan 9, 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/workers/worker-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
################################
## Airflow Worker ServiceAccount
#################################
{{- if and .Values.workers.serviceAccount.create (or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") (eq .Values.executor "KubernetesExecutor")) }}
{{- if and .Values.workers.serviceAccount.create (or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") (eq .Values.executor "KubernetesExecutor") (eq .Values.executor "LocalKubernetesExecutor")) }}
kind: ServiceAccount
apiVersion: v1
metadata:
Expand Down
30 changes: 30 additions & 0 deletions tests/charts/test_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,3 +758,33 @@ def test_should_add_component_specific_labels(self):

assert "test_label" in jmespath.search("metadata.labels", docs[0])
assert jmespath.search("metadata.labels", docs[0])["test_label"] == "test_label_value"

@pytest.mark.parametrize(
"executor, creates_service_account",
[
("LocalExecutor", False),
("CeleryExecutor", True),
("CeleryKubernetesExecutor", True),
("KubernetesExecutor", True),
("LocalKubernetesExecutor", True),
],
)
def test_should_create_worker_service_account_for_specific_executors(
self, executor, creates_service_account
):
docs = render_chart(
values={
"executor": executor,
"workers": {
"serviceAccount": {"create": True},
"labels": {"test_label": "test_label_value"},
},
},
show_only=["templates/workers/worker-serviceaccount.yaml"],
)
if creates_service_account:
assert jmespath.search("kind", docs[0]) == "ServiceAccount"
assert "test_label" in jmespath.search("metadata.labels", docs[0])
assert jmespath.search("metadata.labels", docs[0])["test_label"] == "test_label_value"
else:
assert docs == []