apache
diff --git a/‎UPDATING.md‎
Lines changed: 8 additions & 0 deletions b/‎UPDATING.md‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎airflow/kubernetes/kube_client.py‎
Lines changed: 10 additions & 37 deletions b/‎airflow/kubernetes/kube_client.py‎
Lines changed: 10 additions & 37 deletions
diff --git a/‎airflow/kubernetes/refresh_config.py‎
Lines changed: 0 additions & 124 deletions b/‎airflow/kubernetes/refresh_config.py‎
Lines changed: 0 additions & 124 deletions
@@ -81,6 +81,14 @@ https://developers.google.com/style/inclusive-documentation
 
 -->
 
+## Airflow 2.2.5
+
+### Minimum kubernetes version bumped from 3.0.0 to  21.7.0
+
+No change in behavior is expected.  This was necessary in order to take advantage of a [bugfix](https://github.com/kubernetes-client/python-base/commit/70b78cd8488068c014b6d762a0c8d358273865b4) concerning refreshing of Kubernetes API tokens with EKS, which enabled the removal of some [workaround code](https://github.com/apache/airflow/pull/20759).
+
+### Deprecation: `Connection.extra` must be JSON-encoded dict
+
 ## Airflow 2.2.4
 
 ### Smart sensors deprecated
 
@@ -25,39 +25,10 @@
 try:
     from kubernetes import client, config
     from kubernetes.client import Configuration
-    from kubernetes.client.api_client import ApiClient
     from kubernetes.client.rest import ApiException
 
-    from airflow.kubernetes.refresh_config import RefreshConfiguration, load_kube_config
-
     has_kubernetes = True
 
-    def _get_kube_config(
-        in_cluster: bool, cluster_context: Optional[str], config_file: Optional[str]
-    ) -> Optional[Configuration]:
-        if in_cluster:
-            # load_incluster_config set default configuration with config populated by k8s
-            config.load_incluster_config()
-            return None
-        else:
-            # this block can be replaced with just config.load_kube_config once
-            # refresh_config module is replaced with upstream fix
-            cfg = RefreshConfiguration()
-            load_kube_config(client_configuration=cfg, config_file=config_file, context=cluster_context)
-            return cfg
-
-    def _get_client_with_patched_configuration(cfg: Optional[Configuration]) -> client.CoreV1Api:
-        """
-        This is a workaround for supporting api token refresh in k8s client.
-
-        The function can be replace with `return client.CoreV1Api()` once the
-        upstream client supports token refresh.
-        """
-        if cfg:
-            return client.CoreV1Api(api_client=ApiClient(configuration=cfg))
-        else:
-            return client.CoreV1Api()
-
     def _disable_verify_ssl() -> None:
         configuration = Configuration()
         configuration.verify_ssl = False
@@ -130,17 +101,19 @@ def get_kube_client(
     if not has_kubernetes:
         raise _import_err
 
-    if not in_cluster:
-        if cluster_context is None:
-            cluster_context = conf.get('kubernetes', 'cluster_context', fallback=None)
-        if config_file is None:
-            config_file = conf.get('kubernetes', 'config_file', fallback=None)
-
     if conf.getboolean('kubernetes', 'enable_tcp_keepalive'):
         _enable_tcp_keepalive()
 
     if not conf.getboolean('kubernetes', 'verify_ssl'):
         _disable_verify_ssl()
 
-    client_conf = _get_kube_config(in_cluster, cluster_context, config_file)
-    return _get_client_with_patched_configuration(client_conf)
+    if in_cluster:
+        config.load_incluster_config()
+    else:
+        if cluster_context is None:
+            cluster_context = conf.get('kubernetes', 'cluster_context', fallback=None)
+        if config_file is None:
+            config_file = conf.get('kubernetes', 'config_file', fallback=None)
+        config.load_kube_config(config_file=config_file, context=cluster_context)
+
+    return client.CoreV1Api()