Skip to content

Remove airflow_version from k8s executor pod selector #42751

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
potiuk merged 1 commit into from
Oct 5, 2024
Merged

Remove airflow_version from k8s executor pod selector #42751

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
6 changes: 5 additions & 1 deletion airflow/providers/cncf/kubernetes/pod_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ def build_selector_for_k8s_executor_pod(
execution_date=None,
run_id=None,
airflow_worker=None,
include_version=False,
):
"""
Generate selector for kubernetes executor pod.
Expand All @@ -491,6 +492,7 @@ def build_selector_for_k8s_executor_pod(
execution_date=execution_date,
run_id=run_id,
airflow_worker=airflow_worker,
include_version=include_version,
)
label_strings = [f"{label_id}={label}" for label_id, label in sorted(labels.items())]
selector = ",".join(label_strings)
Expand All @@ -509,6 +511,7 @@ def build_labels_for_k8s_executor_pod(
map_index=None,
execution_date=None,
run_id=None,
include_version=True,
):
"""
Generate labels for kubernetes executor pod.
Expand All @@ -520,8 +523,9 @@ def build_labels_for_k8s_executor_pod(
"task_id": make_safe_label_value(task_id),
"try_number": str(try_number),
"kubernetes_executor": "True",
"airflow_version": airflow_version.replace("+", "-"),
}
if include_version:
labels["airflow_version"] = airflow_version.replace("+", "-")
if airflow_worker is not None:
labels["airflow-worker"] = make_safe_label_value(str(airflow_worker))
if map_index is not None and map_index >= 0:
Expand Down
1 change: 1 addition & 0 deletions tests/providers/cncf/kubernetes/test_pod_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,7 @@ def test_build_labels_for_k8s_executor_pod(self, extra, extra_expected):
)
labels = PodGenerator.build_labels_for_k8s_executor_pod(**kwargs, **extra)
assert labels == {**expected, **extra_expected}
del labels["airflow_version"] # excluded from selector in case upgrade
items = [f"{k}={v}" for k, v in sorted(labels.items())]
if "airflow_worker" not in extra:
items.append("airflow-worker")
Expand Down