From b648cb918efa0fc6ef72b455bee680c8cdedae74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=A9?= Date: Mon, 12 Dec 2022 06:41:57 +0000 Subject: [PATCH 1/4] fix load_config unexpected keyword argument --- kubernetes/base/config/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/kubernetes/base/config/__init__.py b/kubernetes/base/config/__init__.py index 69ed7f1fc3..74c24dcc5c 100644 --- a/kubernetes/base/config/__init__.py +++ b/kubernetes/base/config/__init__.py @@ -34,6 +34,7 @@ def load_config(**kwargs): load_incluster_config functions. """ if "kube_config_path" in kwargs.keys() or exists(expanduser(KUBE_CONFIG_DEFAULT_LOCATION)): + kwargs["config_file"] = kwargs.pop("kube_config_path", None) load_kube_config(**kwargs) else: print( From 6da7447d3abcfae1c278c7d8a200288b5e408cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=A9?= Date: Mon, 12 Dec 2022 06:54:17 +0000 Subject: [PATCH 2/4] separte weak relate condtions --- kubernetes/base/config/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kubernetes/base/config/__init__.py b/kubernetes/base/config/__init__.py index 74c24dcc5c..d66816e273 100644 --- a/kubernetes/base/config/__init__.py +++ b/kubernetes/base/config/__init__.py @@ -33,8 +33,12 @@ def load_config(**kwargs): can be passed to either load_kube_config or load_incluster_config functions. """ - if "kube_config_path" in kwargs.keys() or exists(expanduser(KUBE_CONFIG_DEFAULT_LOCATION)): - kwargs["config_file"] = kwargs.pop("kube_config_path", None) + if "kube_config_path" in kwargs.keys(): + kube_config_path = kwargs.pop("kube_config_path", None) + if "config_file" not in kwargs.keys(): + kwargs["config_file"] = kube_config_path + load_kube_config(**kwargs) + elif exists(expanduser(KUBE_CONFIG_DEFAULT_LOCATION)): load_kube_config(**kwargs) else: print( From ab478a309f6fbc265c0a3c9d595b281107f2f6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=A9?= Date: Mon, 12 Dec 2022 06:59:59 +0000 Subject: [PATCH 3/4] remove config_file arg check --- kubernetes/base/config/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kubernetes/base/config/__init__.py b/kubernetes/base/config/__init__.py index d66816e273..f41a4b39a8 100644 --- a/kubernetes/base/config/__init__.py +++ b/kubernetes/base/config/__init__.py @@ -34,9 +34,7 @@ def load_config(**kwargs): load_incluster_config functions. """ if "kube_config_path" in kwargs.keys(): - kube_config_path = kwargs.pop("kube_config_path", None) - if "config_file" not in kwargs.keys(): - kwargs["config_file"] = kube_config_path + kwargs["config_file"] = kwargs.pop("kube_config_path", None) load_kube_config(**kwargs) elif exists(expanduser(KUBE_CONFIG_DEFAULT_LOCATION)): load_kube_config(**kwargs) From 6764e8d7dd797590a76d26eaeed415987877a987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=A9?= Date: Wed, 21 Dec 2022 06:58:51 +0000 Subject: [PATCH 4/4] keep config_file value --- kubernetes/base/config/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kubernetes/base/config/__init__.py b/kubernetes/base/config/__init__.py index f41a4b39a8..3f49ce0e91 100644 --- a/kubernetes/base/config/__init__.py +++ b/kubernetes/base/config/__init__.py @@ -33,7 +33,9 @@ def load_config(**kwargs): can be passed to either load_kube_config or load_incluster_config functions. """ - if "kube_config_path" in kwargs.keys(): + if "config_file" in kwargs.keys(): + load_kube_config(**kwargs) + elif "kube_config_path" in kwargs.keys(): kwargs["config_file"] = kwargs.pop("kube_config_path", None) load_kube_config(**kwargs) elif exists(expanduser(KUBE_CONFIG_DEFAULT_LOCATION)):