This is an automated email from the ASF dual-hosted git repository.
jscheffl 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 7b90ba85162 [chart/v1-2x-test] Add team_name as option for
dag_bundle_config_list in Helm Chart (#67991) (#68015)
7b90ba85162 is described below
commit 7b90ba851624b5f8b1f865db3dd94d0019a5ba8d
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Jun 4 16:13:51 2026 +0200
[chart/v1-2x-test] Add team_name as option for dag_bundle_config_list in
Helm Chart (#67991) (#68015)
Since the addition of multi team, support the kwarg team_name.
This change will allow the helm chart to support team_name as an
option for airflow.config.dag_processor.dag_bundle_config_list
(cherry picked from commit a493aae41786134c777c34d57f0b998fb9566364)
Co-authored-by: KidAmnesiac1 <[email protected]>
---
chart/templates/_helpers.yaml | 3 +++
chart/values.schema.json | 4 ++++
.../tests/helm_tests/airflow_aux/test_configmap.py | 21 ++++++++++++++++++++-
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/chart/templates/_helpers.yaml b/chart/templates/_helpers.yaml
index 1a40e3ae11d..fd5c0c5153b 100644
--- a/chart/templates/_helpers.yaml
+++ b/chart/templates/_helpers.yaml
@@ -1119,6 +1119,9 @@ Usage:
{{- $bundles := list -}}
{{- range .Values.dagProcessor.dagBundleConfigList -}}
{{- $bundle := dict "name" .name "classpath" .classpath "kwargs"
(.kwargs | default dict) -}}
+ {{- if .team_name -}}
+ {{- $_ := set $bundle "team_name" .team_name -}}
+ {{- end -}}
{{- $bundles = append $bundles $bundle -}}
{{- end -}}
{{- $bundles | toJson -}}
diff --git a/chart/values.schema.json b/chart/values.schema.json
index 2ee9edf65c5..73e35b594d5 100644
--- a/chart/values.schema.json
+++ b/chart/values.schema.json
@@ -5816,6 +5816,10 @@
"description": "Name of the Dag bundle.",
"type": "string"
},
+ "team_name": {
+ "description": "Team name for the Dag bundle.",
+ "type": "string"
+ },
"classpath": {
"description": "Class path of the Dag bundle
class.",
"type": "string"
diff --git a/helm-tests/tests/helm_tests/airflow_aux/test_configmap.py
b/helm-tests/tests/helm_tests/airflow_aux/test_configmap.py
index 54c55186363..5437db7a4db 100644
--- a/helm-tests/tests/helm_tests/airflow_aux/test_configmap.py
+++ b/helm-tests/tests/helm_tests/airflow_aux/test_configmap.py
@@ -398,6 +398,16 @@ metadata:
"classpath":
"airflow.dag_processing.bundles.local.LocalDagBundle",
"kwargs": {},
},
+ {
+ "name": "team-bundle",
+ "team_name": "team-a",
+ "classpath":
"airflow.providers.git.bundles.git.GitDagBundle",
+ "kwargs": {
+ "git_conn_id": "GITHUB__team_repo",
+ "subdir": "team-dags",
+ "tracking_ref": "main",
+ },
+ },
],
},
},
@@ -415,7 +425,7 @@ metadata:
# Parse and validate JSON structure
bundles = json.loads(json_str)
assert isinstance(bundles, list), "dag_bundle_config_list should be a
list"
- assert len(bundles) == 3, f"Expected 3 bundles, got {len(bundles)}"
+ assert len(bundles) == 4, f"Expected 4 bundles, got {len(bundles)}"
# Verify bundle1
bundle1 = next((b for b in bundles if b["name"] == "bundle1"), None)
@@ -440,3 +450,12 @@ metadata:
assert dags_folder is not None, "dags-folder not found"
assert dags_folder["classpath"] ==
"airflow.dag_processing.bundles.local.LocalDagBundle"
assert dags_folder["kwargs"] == {}
+
+ # Verify team-bundle
+ team_bundle = next((b for b in bundles if b["name"] == "team-bundle"),
None)
+ assert team_bundle is not None, "team-bundle not found"
+ assert team_bundle["team_name"] == "team-a"
+ assert team_bundle["classpath"] ==
"airflow.providers.git.bundles.git.GitDagBundle"
+ assert team_bundle["kwargs"]["git_conn_id"] == "GITHUB__team_repo"
+ assert team_bundle["kwargs"]["subdir"] == "team-dags"
+ assert team_bundle["kwargs"]["tracking_ref"] == "main"
