From 46ad65dd59aa76cc37afb8bb0300447a2e6a2de4 Mon Sep 17 00:00:00 2001 From: romsharon98 Date: Sat, 26 Oct 2024 18:27:32 +0300 Subject: [PATCH 1/5] change default namespace value to be None --- airflow/www/static/js/utils/index.ts | 2 +- .../airflow/providers/cncf/kubernetes/decorators/kubernetes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airflow/www/static/js/utils/index.ts b/airflow/www/static/js/utils/index.ts index 8bef31a8582a9..87428ce8363d1 100644 --- a/airflow/www/static/js/utils/index.ts +++ b/airflow/www/static/js/utils/index.ts @@ -170,7 +170,7 @@ interface RunLabelProps { const getDagRunLabel = ({ dagRun, ordering = ["executionDate"], -}: RunLabelProps) => dagRun[ordering[0]]; +}: RunLabelProps) => dagRun[ordering[0]] ?? dagRun[ordering[1]]; const getStatusBackgroundColor = (color: string, hasNote: boolean) => hasNote diff --git a/providers/src/airflow/providers/cncf/kubernetes/decorators/kubernetes.py b/providers/src/airflow/providers/cncf/kubernetes/decorators/kubernetes.py index 2f00de10b0c27..c3f5951540cb4 100644 --- a/providers/src/airflow/providers/cncf/kubernetes/decorators/kubernetes.py +++ b/providers/src/airflow/providers/cncf/kubernetes/decorators/kubernetes.py @@ -65,7 +65,7 @@ class _KubernetesDecoratedOperator(DecoratedOperator, KubernetesPodOperator): # there are some cases we can't deepcopy the objects (e.g protobuf). shallow_copy_attrs: Sequence[str] = ("python_callable",) - def __init__(self, namespace: str = "default", use_dill: bool = False, **kwargs) -> None: + def __init__(self, namespace: str | None = None, use_dill: bool = False, **kwargs) -> None: self.use_dill = use_dill super().__init__( namespace=namespace, From fd107c20022460d1d793980551111d3982f906e5 Mon Sep 17 00:00:00 2001 From: romsharon98 Date: Sun, 27 Oct 2024 00:17:51 +0300 Subject: [PATCH 2/5] passing namespace to decorator when in_cluster=False --- providers/tests/cncf/kubernetes/decorators/test_kubernetes.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/providers/tests/cncf/kubernetes/decorators/test_kubernetes.py b/providers/tests/cncf/kubernetes/decorators/test_kubernetes.py index 93198cbe0a7e9..9545e9adbf3d7 100644 --- a/providers/tests/cncf/kubernetes/decorators/test_kubernetes.py +++ b/providers/tests/cncf/kubernetes/decorators/test_kubernetes.py @@ -78,6 +78,7 @@ def test_basic_kubernetes(dag_maker, session, mock_create_pod: mock.Mock, mock_h in_cluster=False, cluster_context="default", config_file="/tmp/fake_file", + namespace="default", ) def f(): import random @@ -122,6 +123,7 @@ def test_kubernetes_with_input_output( in_cluster=False, cluster_context="default", config_file="/tmp/fake_file", + namespace="default", ) def f(arg1, arg2, kwarg1=None, kwarg2=None): return {"key1": "value1", "key2": "value2"} From bdd1a934e5369fc5bc33b252b676a559a4a82d71 Mon Sep 17 00:00:00 2001 From: romsharon98 Date: Fri, 1 Nov 2024 10:31:22 +0200 Subject: [PATCH 3/5] add breaking change --- .../src/airflow/providers/cncf/kubernetes/CHANGELOG.rst | 8 ++++++++ .../src/airflow/providers/cncf/kubernetes/provider.yaml | 1 + 2 files changed, 9 insertions(+) diff --git a/providers/src/airflow/providers/cncf/kubernetes/CHANGELOG.rst b/providers/src/airflow/providers/cncf/kubernetes/CHANGELOG.rst index c54da827b56e2..4d1af831d4d4d 100644 --- a/providers/src/airflow/providers/cncf/kubernetes/CHANGELOG.rst +++ b/providers/src/airflow/providers/cncf/kubernetes/CHANGELOG.rst @@ -27,6 +27,14 @@ Changelog --------- + +main +..... + +.. warning:: + Set the default value of ``namespace`` in _KubernetesDecoratedOperator to ``None``, so it uses the cluster namespace when ``in_cluster`` is True. To retain the previous behavior, set ``namespace="default"`` + + 9.0.1 ..... diff --git a/providers/src/airflow/providers/cncf/kubernetes/provider.yaml b/providers/src/airflow/providers/cncf/kubernetes/provider.yaml index a6f4b266b6ff2..79c885ffb0141 100644 --- a/providers/src/airflow/providers/cncf/kubernetes/provider.yaml +++ b/providers/src/airflow/providers/cncf/kubernetes/provider.yaml @@ -25,6 +25,7 @@ state: ready source-date-epoch: 1730012271 # note that those versions are maintained by release manager - do not update them manually versions: + - 10.0.0 - 9.0.1 - 9.0.0 - 8.4.2 From 756a5ea1c6c6f6048930e8d97eb25061c94036c7 Mon Sep 17 00:00:00 2001 From: romsharon98 Date: Tue, 5 Nov 2024 13:28:09 +0200 Subject: [PATCH 4/5] change changelog --- providers/src/airflow/providers/cncf/kubernetes/CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/src/airflow/providers/cncf/kubernetes/CHANGELOG.rst b/providers/src/airflow/providers/cncf/kubernetes/CHANGELOG.rst index 4d1af831d4d4d..28417d6ac3da1 100644 --- a/providers/src/airflow/providers/cncf/kubernetes/CHANGELOG.rst +++ b/providers/src/airflow/providers/cncf/kubernetes/CHANGELOG.rst @@ -32,7 +32,7 @@ main ..... .. warning:: - Set the default value of ``namespace`` in _KubernetesDecoratedOperator to ``None``, so it uses the cluster namespace when ``in_cluster`` is True. To retain the previous behavior, set ``namespace="default"`` + Set the default value of ``namespace`` in ``@task.kubernetes`` to ``None``, so it uses the cluster namespace when ``in_cluster`` is True. Be sure to specify a namespace when using this decorator. To retain the previous behavior, set ``namespace="default"`` 9.0.1 From 29247409b3beec85cdb39206ee48d93ba546b5e8 Mon Sep 17 00:00:00 2001 From: romsharon98 Date: Tue, 5 Nov 2024 13:32:27 +0200 Subject: [PATCH 5/5] revert ui change --- airflow/www/static/js/utils/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airflow/www/static/js/utils/index.ts b/airflow/www/static/js/utils/index.ts index 87428ce8363d1..8bef31a8582a9 100644 --- a/airflow/www/static/js/utils/index.ts +++ b/airflow/www/static/js/utils/index.ts @@ -170,7 +170,7 @@ interface RunLabelProps { const getDagRunLabel = ({ dagRun, ordering = ["executionDate"], -}: RunLabelProps) => dagRun[ordering[0]] ?? dagRun[ordering[1]]; +}: RunLabelProps) => dagRun[ordering[0]]; const getStatusBackgroundColor = (color: string, hasNote: boolean) => hasNote