diff --git a/chart/templates/scheduler/scheduler-deployment.yaml b/chart/templates/scheduler/scheduler-deployment.yaml
index 0b76eb4587a55..0b04abab8d100 100644
--- a/chart/templates/scheduler/scheduler-deployment.yaml
+++ b/chart/templates/scheduler/scheduler-deployment.yaml
@@ -57,7 +57,7 @@ metadata:
release: {{ .Release.Name }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
- executor: {{ .Values.executor }}
+ executor: "{{ .Values.executor }}"
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
diff --git a/chart/templates/scheduler/scheduler-serviceaccount.yaml b/chart/templates/scheduler/scheduler-serviceaccount.yaml
index 0f4f8cfaa67e0..641fdb82a5e7a 100644
--- a/chart/templates/scheduler/scheduler-serviceaccount.yaml
+++ b/chart/templates/scheduler/scheduler-serviceaccount.yaml
@@ -23,7 +23,7 @@
{{- if and .Values.scheduler.enabled .Values.scheduler.serviceAccount.create }}
apiVersion: v1
kind: ServiceAccount
-{{- if eq .Values.executor "CeleryExecutor" }}
+{{- if contains "CeleryExecutor" .Values.executor }}
automountServiceAccountToken: {{ .Values.scheduler.serviceAccount.automountServiceAccountToken }}
{{- end }}
metadata:
diff --git a/helm_tests/airflow_core/test_scheduler.py b/helm_tests/airflow_core/test_scheduler.py
index 09e46e70bad8d..d21393cc8476c 100644
--- a/helm_tests/airflow_core/test_scheduler.py
+++ b/helm_tests/airflow_core/test_scheduler.py
@@ -838,6 +838,7 @@ def test_persistence_volume_annotations(self):
"CeleryExecutor",
"KubernetesExecutor",
"CeleryKubernetesExecutor",
+ "CeleryExecutor,KubernetesExecutor",
],
)
def test_scheduler_deployment_has_executor_label(self, executor):
@@ -1021,6 +1022,7 @@ def test_should_add_component_specific_labels(self):
("CeleryKubernetesExecutor", None),
("KubernetesExecutor", None),
("LocalKubernetesExecutor", None),
+ ("CeleryExecutor,KubernetesExecutor", True),
],
)
def test_default_automount_service_account_token(self, executor, default_automount_service_account):
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy