Merge branch 'main' into 42559/aip-84/delete-connection-to-fast-api

apache · Sep 30, 2024 · c5e598b · c5e598b
2 parents a02bfba + 6808619
commit c5e598b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/airflow/providers/cncf/kubernetes/hooks/kubernetes.py b/airflow/providers/cncf/kubernetes/hooks/kubernetes.py
@@ -250,6 +250,8 @@ def get_conn(self) -> client.ApiClient:
         if kubeconfig is not None:
             with tempfile.NamedTemporaryFile() as temp_config:
                 self.log.debug("loading kube_config from: connection kube_config")
+                if isinstance(kubeconfig, dict):
+                    kubeconfig = json.dumps(kubeconfig)
                 temp_config.write(kubeconfig.encode())
                 temp_config.flush()
                 self._is_in_cluster = False

diff --git a/tests/providers/cncf/kubernetes/hooks/test_kubernetes.py b/tests/providers/cncf/kubernetes/hooks/test_kubernetes.py
@@ -79,6 +79,7 @@ def setup_class(cls) -> None:
             ("in_cluster", {"in_cluster": True}),
             ("in_cluster_empty", {"in_cluster": ""}),
             ("kube_config", {"kube_config": '{"test": "kube"}'}),
+            ("kube_config_dict", {"kube_config": {"test": "kube"}}),
             ("kube_config_path", {"kube_config_path": "path/to/file"}),
             ("kube_config_empty", {"kube_config": ""}),
             ("kube_config_path_empty", {"kube_config_path": ""}),
@@ -285,6 +286,7 @@ def test_kube_config_path(
         (
             (None, False),
             ("kube_config", True),
+            ("kube_config_dict", True),
             ("kube_config_empty", False),
         ),
     )