Skip to content

[chart/v1-2x-test] Fix role bindings for workers.celery.serviceAccount (#68306) #68351

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
jscheffl merged 1 commit into from
Jun 10, 2026
Merged

[chart/v1-2x-test] Fix role bindings for workers.celery.serviceAccount (#68306) #68351

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
15 changes: 8 additions & 7 deletions chart/templates/rbac/job-launcher-rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,18 @@ roleRef:
subjects:
{{- if and .Values.scheduler.enabled (or (contains "LocalExecutor" .Values.executor) (contains "KubernetesExecutor" .Values.executor) (contains "LocalKubernetesExecutor" .Values.executor) (contains "CeleryKubernetesExecutor" .Values.executor)) }}
- kind: ServiceAccount
name: {{ include "scheduler.serviceAccountName" $ }}
namespace: "{{ $.Release.Namespace }}"
name: {{ include "scheduler.serviceAccountName" . }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- if or (contains "CeleryExecutor" .Values.executor) (contains "CeleryKubernetesExecutor" .Values.executor) (and (or (contains "KubernetesExecutor" .Values.executor) (contains "LocalKubernetesExecutor" .Values.executor)) (eq .Values.workers.kubernetes.serviceAccount.create nil)) }}
{{- $create := or .Values.workers.celery.serviceAccount.create (and (not (has .Values.workers.celery.serviceAccount.create (list true false))) .Values.workers.serviceAccount.create) }}
{{- if or (and (or (contains "CeleryExecutor" .Values.executor) (contains "CeleryKubernetesExecutor" .Values.executor)) (or $create .Values.workers.celery.serviceAccount.name .Values.workers.serviceAccount.name)) (and (or (contains "KubernetesExecutor" .Values.executor) (contains "LocalKubernetesExecutor" .Values.executor)) (eq .Values.workers.kubernetes.serviceAccount.create nil)) }}
- kind: ServiceAccount
name: {{ include "worker.serviceAccountName" $ }}
namespace: "{{ $.Release.Namespace }}"
name: {{ default (include "worker.serviceAccountName" .) .Values.workers.celery.serviceAccount.name }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- if and (or .Values.workers.kubernetes.serviceAccount.create .Values.workers.kubernetes.serviceAccount.name) (contains "KubernetesExecutor" .Values.executor) }}
- kind: ServiceAccount
name: {{ include "worker.kubernetes.serviceAccountName" $ }}
namespace: "{{ $.Release.Namespace }}"
name: {{ include "worker.kubernetes.serviceAccountName" . }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- end }}
15 changes: 8 additions & 7 deletions chart/templates/rbac/pod-launcher-rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,19 @@ roleRef:
subjects:
{{- if and .Values.scheduler.enabled (or (contains "LocalExecutor" .Values.executor) (contains "KubernetesExecutor" .Values.executor) (contains "LocalKubernetesExecutor" .Values.executor) (contains "CeleryKubernetesExecutor" .Values.executor)) }}
- kind: ServiceAccount
name: {{ include "scheduler.serviceAccountName" $ }}
namespace: "{{ $.Release.Namespace }}"
name: {{ include "scheduler.serviceAccountName" . }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- if or (contains "CeleryExecutor" .Values.executor) (contains "CeleryKubernetesExecutor" .Values.executor) (and (or (contains "KubernetesExecutor" .Values.executor) (contains "LocalKubernetesExecutor" .Values.executor)) (eq .Values.workers.kubernetes.serviceAccount.create nil)) }}
{{- $create := or .Values.workers.celery.serviceAccount.create (and (not (has .Values.workers.celery.serviceAccount.create (list true false))) .Values.workers.serviceAccount.create) }}
{{- if or (and (or (contains "CeleryExecutor" .Values.executor) (contains "CeleryKubernetesExecutor" .Values.executor)) (or $create .Values.workers.celery.serviceAccount.name .Values.workers.serviceAccount.name)) (and (or (contains "KubernetesExecutor" .Values.executor) (contains "LocalKubernetesExecutor" .Values.executor)) (eq .Values.workers.kubernetes.serviceAccount.create nil)) }}
- kind: ServiceAccount
name: {{ include "worker.serviceAccountName" $ }}
namespace: "{{ $.Release.Namespace }}"
name: {{ default (include "worker.serviceAccountName" .) .Values.workers.celery.serviceAccount.name }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- if and (or .Values.workers.kubernetes.serviceAccount.create .Values.workers.kubernetes.serviceAccount.name) (contains "KubernetesExecutor" .Values.executor) }}
- kind: ServiceAccount
name: {{ include "worker.kubernetes.serviceAccountName" $ }}
namespace: "{{ $.Release.Namespace }}"
name: {{ include "worker.kubernetes.serviceAccountName" . }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- if .Values.triggerer.enabled }}
- kind: ServiceAccount
Expand Down
5 changes: 3 additions & 2 deletions chart/templates/rbac/security-context-constraint-rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ subjects:
name: {{ include "webserver.serviceAccountName" . }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- if or (contains "CeleryExecutor" .Values.executor) (contains "CeleryKubernetesExecutor" .Values.executor) (and (or (contains "KubernetesExecutor" .Values.executor) (contains "LocalKubernetesExecutor" .Values.executor)) (eq .Values.workers.kubernetes.serviceAccount.create nil)) }}
{{- $create := or .Values.workers.celery.serviceAccount.create (and (not (has .Values.workers.celery.serviceAccount.create (list true false))) .Values.workers.serviceAccount.create) }}
{{- if or (and (or (contains "CeleryExecutor" .Values.executor) (contains "CeleryKubernetesExecutor" .Values.executor)) (or $create .Values.workers.celery.serviceAccount.name .Values.workers.serviceAccount.name)) (and (or (contains "KubernetesExecutor" .Values.executor) (contains "LocalKubernetesExecutor" .Values.executor)) (eq .Values.workers.kubernetes.serviceAccount.create nil)) }}
- kind: ServiceAccount
name: {{ include "worker.serviceAccountName" . }}
name: {{ default (include "worker.serviceAccountName" .) .Values.workers.celery.serviceAccount.name }}
namespace: "{{ .Release.Namespace }}"
{{- end }}
{{- if and (or .Values.workers.kubernetes.serviceAccount.create .Values.workers.kubernetes.serviceAccount.name) (contains "KubernetesExecutor" .Values.executor) }}
Expand Down
194 changes: 194 additions & 0 deletions helm-tests/tests/helm_tests/airflow_aux/test_job_launcher_role.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ def test_scheduler_role_binding_should_not_exists_airflow_2(self, executor, enab
"CeleryExecutor",
"KubernetesExecutor",
"LocalExecutor,CeleryExecutor",
"LocalExecutor,KubernetesExecutor",
],
)
def test_worker_role_binding_should_exists(self, executor):
Expand All @@ -328,6 +329,7 @@ def test_worker_role_binding_should_exists(self, executor):
"LocalKubernetesExecutor",
"CeleryKubernetesExecutor",
"LocalExecutor,CeleryExecutor",
"LocalExecutor,KubernetesExecutor",
],
)
def test_worker_role_binding_should_exists_airflow_2(self, executor):
Expand Down Expand Up @@ -598,6 +600,198 @@ def test_worker_kubernetes_role_binding_should_not_exists_airflow_2(

assert jmespath.search("subjects[?name=='prod-airflow-worker-kubernetes']", docs[0]) == []

@pytest.mark.parametrize(
"executor",
[
"CeleryExecutor",
"CeleryExecutor,KubernetesExecutor",
"LocalExecutor,CeleryExecutor,KubernetesExecutor",
],
)
@pytest.mark.parametrize("create", [True, None])
def test_worker_role_binding_should_exists_with_celery(self, executor, create):
docs = render_chart(
name="prod",
namespace="airflow",
values={
"rbac": {"create": True},
"allowJobLaunching": True,
"executor": executor,
"workers": {"celery": {"serviceAccount": {"create": create}}},
},
show_only=["templates/rbac/job-launcher-rolebinding.yaml"],
)

assert jmespath.search("subjects[?name=='prod-airflow-worker'] | [0]", docs[0]) == {
"kind": "ServiceAccount",
"name": "prod-airflow-worker",
"namespace": "airflow",
}

@pytest.mark.parametrize(
"executor",
[
"CeleryExecutor",
"CeleryExecutor,KubernetesExecutor",
"LocalExecutor,CeleryExecutor,KubernetesExecutor",
"LocalKubernetesExecutor",
"CeleryKubernetesExecutor",
],
)
@pytest.mark.parametrize("create", [True, None])
def test_worker_role_binding_should_exists_with_celery_airflow_2(self, executor, create):
docs = render_chart(
name="prod",
namespace="airflow",
values={
"airflowVersion": "2.11.0",
"rbac": {"create": True},
"allowJobLaunching": True,
"executor": executor,
"workers": {"celery": {"serviceAccount": {"create": create}}},
},
show_only=["templates/rbac/job-launcher-rolebinding.yaml"],
)

assert jmespath.search("subjects[?name=='prod-airflow-worker'] | [0]", docs[0]) == {
"kind": "ServiceAccount",
"name": "prod-airflow-worker",
"namespace": "airflow",
}

def test_worker_celery_role_binding_should_not_exists_with_celery_executor(self):
docs = render_chart(
name="prod",
values={
"rbac": {"create": True},
"allowJobLaunching": True,
"executor": "CeleryExecutor",
"workers": {"celery": {"serviceAccount": {"create": False}}},
},
show_only=["templates/rbac/job-launcher-rolebinding.yaml"],
)

assert jmespath.search("subjects", docs[0]) is None

def test_worker_celery_role_binding_should_not_exists_with_celery_executor_airflow_2(self):
docs = render_chart(
name="prod",
values={
"airflowVersion": "2.11.0",
"rbac": {"create": True},
"allowJobLaunching": True,
"executor": "CeleryExecutor",
"workers": {"celery": {"serviceAccount": {"create": False}}},
},
show_only=["templates/rbac/job-launcher-rolebinding.yaml"],
)

assert jmespath.search("subjects", docs[0]) is None

@pytest.mark.parametrize("executor", ["LocalExecutor", "LocalExecutor,CeleryExecutor"])
def test_worker_celery_role_binding_should_not_exists(self, executor):
docs = render_chart(
name="prod",
values={
"rbac": {"create": True},
"allowJobLaunching": True,
"executor": executor,
"workers": {"celery": {"serviceAccount": {"create": False}}},
},
show_only=["templates/rbac/job-launcher-rolebinding.yaml"],
)

assert jmespath.search("subjects[?name=='prod-airflow-worker']", docs[0]) == []

@pytest.mark.parametrize("executor", ["LocalExecutor", "LocalExecutor,CeleryExecutor"])
def test_worker_celery_role_binding_should_not_exists_airflow_2(self, executor):
docs = render_chart(
name="prod",
values={
"airflowVersion": "2.11.0",
"rbac": {"create": True},
"allowJobLaunching": True,
"executor": executor,
"workers": {"celery": {"serviceAccount": {"create": False}}},
},
show_only=["templates/rbac/job-launcher-rolebinding.yaml"],
)

assert jmespath.search("subjects[?name=='prod-airflow-worker']", docs[0]) == []

@pytest.mark.parametrize(
"executor",
[
"CeleryExecutor",
"CeleryExecutor,KubernetesExecutor",
"LocalExecutor,CeleryExecutor,KubernetesExecutor",
],
)
@pytest.mark.parametrize(
"service_account_values",
[
{"create": True},
{"name": "prod-airflow-worker"},
{"create": False, "name": "prod-airflow-worker"},
],
)
def test_worker_celery_role_binding_should_exists(self, executor, service_account_values):
docs = render_chart(
name="prod",
namespace="airflow",
values={
"rbac": {"create": True},
"allowJobLaunching": True,
"executor": executor,
"workers": {"celery": {"serviceAccount": service_account_values}},
},
show_only=["templates/rbac/job-launcher-rolebinding.yaml"],
)

assert jmespath.search("subjects[?name=='prod-airflow-worker'] | [0]", docs[0]) == {
"kind": "ServiceAccount",
"name": "prod-airflow-worker",
"namespace": "airflow",
}

@pytest.mark.parametrize(
"executor",
[
"CeleryExecutor",
"CeleryExecutor,KubernetesExecutor",
"LocalExecutor,CeleryExecutor,KubernetesExecutor",
"LocalKubernetesExecutor",
"CeleryKubernetesExecutor",
],
)
@pytest.mark.parametrize(
"service_account_values",
[
{"create": True},
{"name": "prod-airflow-worker"},
{"create": False, "name": "prod-airflow-worker"},
],
)
def test_worker_celery_role_binding_should_exists_airflow_2(self, executor, service_account_values):
docs = render_chart(
name="prod",
namespace="airflow",
values={
"airflowVersion": "2.11.0",
"rbac": {"create": True},
"allowJobLaunching": True,
"executor": executor,
"workers": {"celery": {"serviceAccount": service_account_values}},
},
show_only=["templates/rbac/job-launcher-rolebinding.yaml"],
)

assert jmespath.search("subjects[?name=='prod-airflow-worker'] | [0]", docs[0]) == {
"kind": "ServiceAccount",
"name": "prod-airflow-worker",
"namespace": "airflow",
}

def test_no_role_bindings(self):
docs = render_chart(
name="prod",
Expand Down
Loading
Loading