[airflow] 02/02: Revert "Update Kubernetes library version (#18797)"

[po...@apache.org]

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

potiuk pushed a commit to branch v2-2-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit ea476f98d2fb1687e6798b405117e2cc832fc16a
Author: Ash Berlin-Taylor <as...@firemirror.com>
AuthorDate: Tue Jan 4 12:09:35 2022 +0000

    Revert "Update Kubernetes library version (#18797)"
    
    This reverts commit cb9cdf5285502381298bf459d000dc689c6aab2a.
---
 airflow/providers/cncf/kubernetes/utils/pod_manager.py | 8 ++------
 tests/kubernetes/test_client.py                        | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/airflow/providers/cncf/kubernetes/utils/pod_manager.py b/airflow/providers/cncf/kubernetes/utils/pod_manager.py
index eab45fa..4221ac2 100644
--- a/airflow/providers/cncf/kubernetes/utils/pod_manager.py
+++ b/airflow/providers/cncf/kubernetes/utils/pod_manager.py
@@ -40,11 +40,7 @@ from airflow.kubernetes.pod_generator import PodDefaults
 from airflow.utils.log.logging_mixin import LoggingMixin
 
 if TYPE_CHECKING:
-    try:
-        # Kube >= 19
-        from kubernetes.client.models.core_v1_event_list import CoreV1EventList as V1EventList
-    except ImportError:
-        from kubernetes.client.models.v1_event_list import V1EventList
+    from kubernetes.client.models.core_v1_event_list import CoreV1EventList
 
 
 class PodLaunchFailedException(AirflowException):
@@ -321,7 +317,7 @@ class PodManager(LoggingMixin):
             raise
 
     @tenacity.retry(stop=tenacity.stop_after_attempt(3), wait=tenacity.wait_exponential(), reraise=True)
-    def read_pod_events(self, pod: V1Pod) -> "V1EventList":
+    def read_pod_events(self, pod: V1Pod) -> "CoreV1EventList":
         """Reads events from the POD"""
         try:
             return self._client.list_namespaced_event(
diff --git a/tests/kubernetes/test_client.py b/tests/kubernetes/test_client.py
index 9228e9b..bf5dcfc 100644
--- a/tests/kubernetes/test_client.py
+++ b/tests/kubernetes/test_client.py
@@ -63,9 +63,5 @@ class TestClient(unittest.TestCase):
 
         _disable_verify_ssl()
 
-        # Support wide range of kube client libraries
-        if hasattr(Configuration, 'get_default_copy'):
-            configuration = Configuration.get_default_copy()
-        else:
-            configuration = Configuration()
+        configuration = Configuration()
         self.assertFalse(configuration.verify_ssl)