From 114ff1c32ae5fe70fc03d7543dc00dc7ddc3604a Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Fri, 1 Mar 2024 08:34:27 -0600 Subject: [PATCH 1/3] raise ConfigException on invalid named-arguments to load_incluster_config --- kubernetes/base/config/incluster_config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kubernetes/base/config/incluster_config.py b/kubernetes/base/config/incluster_config.py index 86070df43b..df2de249e4 100644 --- a/kubernetes/base/config/incluster_config.py +++ b/kubernetes/base/config/incluster_config.py @@ -109,12 +109,15 @@ def _read_token_file(self): ) + self._token_refresh_period -def load_incluster_config(client_configuration=None, try_refresh_token=True): +def load_incluster_config(client_configuration=None, try_refresh_token=True, **kwds): """ Use the service account kubernetes gives to pods to connect to kubernetes cluster. It's intended for clients that expect to be running inside a pod running on kubernetes. It will raise an exception if called from a process not running in a kubernetes environment.""" + for val in kds.values(): + if val is not None: + raise ConfigException(f"Unimplemented named-argument {val} for incluster config") InClusterConfigLoader( token_filename=SERVICE_TOKEN_FILENAME, cert_filename=SERVICE_CERT_FILENAME, From dedb6924e8641d33c29112a053de52a0d0ae1039 Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Fri, 1 Mar 2024 08:51:34 -0600 Subject: [PATCH 2/3] Improved exception format --- kubernetes/base/config/incluster_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/base/config/incluster_config.py b/kubernetes/base/config/incluster_config.py index df2de249e4..1dd1e72b8a 100644 --- a/kubernetes/base/config/incluster_config.py +++ b/kubernetes/base/config/incluster_config.py @@ -117,7 +117,7 @@ def load_incluster_config(client_configuration=None, try_refresh_token=True, **k not running in a kubernetes environment.""" for val in kds.values(): if val is not None: - raise ConfigException(f"Unimplemented named-argument {val} for incluster config") + raise ConfigException(f"Unimplemented named-argument {val} for incluster config.") InClusterConfigLoader( token_filename=SERVICE_TOKEN_FILENAME, cert_filename=SERVICE_CERT_FILENAME, From 0ae65f13a5c94516f462771c4e455f9ef4858222 Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Wed, 13 Mar 2024 16:31:11 -0500 Subject: [PATCH 3/3] Update kubernetes/base/config/incluster_config.py --- kubernetes/base/config/incluster_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/base/config/incluster_config.py b/kubernetes/base/config/incluster_config.py index 1dd1e72b8a..d4981d18af 100644 --- a/kubernetes/base/config/incluster_config.py +++ b/kubernetes/base/config/incluster_config.py @@ -115,7 +115,7 @@ def load_incluster_config(client_configuration=None, try_refresh_token=True, **k cluster. It's intended for clients that expect to be running inside a pod running on kubernetes. It will raise an exception if called from a process not running in a kubernetes environment.""" - for val in kds.values(): + for val in kwds.values(): if val is not None: raise ConfigException(f"Unimplemented named-argument {val} for incluster config.") InClusterConfigLoader(