[airflow] branch main updated: Fix `KubernetesPodOperator` sub classes default container_logs (#33090)

[eladkal]

This is an automated email from the ASF dual-hosted git repository.

eladkal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new f83d63ea54 Fix `KubernetesPodOperator` sub classes default 
container_logs (#33090)
f83d63ea54 is described below

commit f83d63ea54df788b472941c07dce4301fc0f1c91
Author: Hussein Awala <huss...@awala.fr>
AuthorDate: Fri Aug 4 06:25:48 2023 +0200

    Fix `KubernetesPodOperator` sub classes default container_logs (#33090)
---
 airflow/providers/cncf/kubernetes/operators/pod.py    | 4 +---
 tests/providers/cncf/kubernetes/operators/test_pod.py | 8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/airflow/providers/cncf/kubernetes/operators/pod.py 
b/airflow/providers/cncf/kubernetes/operators/pod.py
index 704745e433..28810b92ff 100644
--- a/airflow/providers/cncf/kubernetes/operators/pod.py
+++ b/airflow/providers/cncf/kubernetes/operators/pod.py
@@ -361,9 +361,7 @@ class KubernetesPodOperator(BaseOperator):
         self.get_logs = get_logs
         self.container_logs = container_logs
         if self.container_logs == KubernetesPodOperator.BASE_CONTAINER_NAME:
-            self.container_logs = (
-                base_container_name if base_container_name else 
KubernetesPodOperator.BASE_CONTAINER_NAME
-            )
+            self.container_logs = base_container_name if base_container_name 
else self.BASE_CONTAINER_NAME
         self.image_pull_policy = image_pull_policy
         self.node_selector = node_selector or {}
         self.annotations = annotations or {}
diff --git a/tests/providers/cncf/kubernetes/operators/test_pod.py 
b/tests/providers/cncf/kubernetes/operators/test_pod.py
index 3c1b752f71..ea1abfccd5 100644
--- a/tests/providers/cncf/kubernetes/operators/test_pod.py
+++ b/tests/providers/cncf/kubernetes/operators/test_pod.py
@@ -1724,3 +1724,11 @@ def 
test_async_kpo_wait_termination_before_cleanup_on_failure(
 
     # assert that the cleanup is called
     post_complete_action.assert_called_once()
+
+
+def test_default_container_logs():
+    class TestSubclassKPO(KubernetesPodOperator):
+        BASE_CONTAINER_NAME = "test-base-container"
+
+    k = TestSubclassKPO(task_id="task")
+    assert k.container_logs == "test-base-container"