This is an automated email from the ASF dual-hosted git repository.
bugraoz93 pushed a commit to branch chart/v1-2x-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/chart/v1-2x-test by this push:
new 4c6cd0ff8a5 [chart/v1-2x-test] Fix Helm chart executor label to
support executor aliases (#67762) (#67775)
4c6cd0ff8a5 is described below
commit 4c6cd0ff8a5b900eb7f633ee821fc875222ad672
Author: Jens Scheffler <[email protected]>
AuthorDate: Sat May 30 12:22:59 2026 +0200
[chart/v1-2x-test] Fix Helm chart executor label to support executor
aliases (#67762) (#67775)
* Fix Helm chart executor label to support executor aliases
The scheduler Deployment/StatefulSet renders the executor option into a
Kubernetes label and only sanitized the comma separator used between
multiple executors. Executor aliases (name:ExecutorClass) contain a
colon, which is not a valid label character, so a value such as
CeleryExecutor,harvest_exec:KubernetesExecutor produced an invalid label
and the scheduler failed to deploy.
Replace the colon with a hyphen alongside the existing comma handling so
aliased and multi-executor configurations render a valid label.
* Add newsfragment for executor alias label fix
* Remove newsfragment; not needed for a bugfix per AGENTS.md
(cherry picked from commit 62d60e4af15eab925966bde19b4c8e7a05b91b1c)
Co-authored-by: Anurag Pappula
<[email protected]>
---
chart/templates/scheduler/scheduler-deployment.yaml | 2 +-
helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/chart/templates/scheduler/scheduler-deployment.yaml
b/chart/templates/scheduler/scheduler-deployment.yaml
index 22ef7b9aeda..76b34ec2577 100644
--- a/chart/templates/scheduler/scheduler-deployment.yaml
+++ b/chart/templates/scheduler/scheduler-deployment.yaml
@@ -54,7 +54,7 @@ metadata:
release: {{ .Release.Name }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
- executor: {{ .Values.executor | replace "," "-" | trunc 63 | trimSuffix
"-" | trimSuffix ":" | trimSuffix "_" | trimSuffix "." | quote }}
+ executor: {{ .Values.executor | replace "," "-" | replace ":" "-" | trunc
63 | trimSuffix "-" | trimSuffix ":" | trimSuffix "_" | trimSuffix "." | quote
}}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
diff --git a/helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
b/helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
index 88986e26e3b..29f03569308 100644
--- a/helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
+++ b/helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
@@ -366,6 +366,7 @@ class TestBaseChartTest:
["2.11.0", "CeleryExecutor,KubernetesExecutor"],
["3.0.0", "CeleryExecutor"],
["3.0.0", "CeleryExecutor,KubernetesExecutor"],
+ ["3.0.0", "CeleryExecutor,harvest_exec:KubernetesExecutor"],
["default", "CeleryExecutor"],
["default", "CeleryExecutor,KubernetesExecutor"],
],
@@ -507,6 +508,8 @@ class TestBaseChartTest:
expected_labels["executor"] = "CeleryExecutor"
if executor == "CeleryExecutor,KubernetesExecutor":
expected_labels["executor"] =
"CeleryExecutor-KubernetesExecutor"
+ elif executor ==
"CeleryExecutor,harvest_exec:KubernetesExecutor":
+ expected_labels["executor"] =
"CeleryExecutor-harvest_exec-KubernetesExecutor"
if (
executor == "CeleryExecutor"
