From 864563760bbb27e1498f66228c2188e2d6359072 Mon Sep 17 00:00:00 2001 From: Fabrice Rabaute Date: Fri, 4 Oct 2019 16:52:20 -0700 Subject: [PATCH] config: Fix persist_config flag and function calls The persist_config flag was setting the kwargs['config_persister'] to the result of the function kcfg.save_changes and not the function kcfg.save_changes itself. Once this is fixed, the second problem was that the function was called with an argument when it's defined without argument so an exception was raised. --- config/kube_config.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/kube_config.py b/config/kube_config.py index ddfd0b38..65766c98 100644 --- a/config/kube_config.py +++ b/config/kube_config.py @@ -260,7 +260,7 @@ def _refresh_azure_token(self, config): provider.value['access-token'] = token_response['accessToken'] provider.value['expires-on'] = token_response['expiresOn'] if self._config_persister: - self._config_persister(self._config.value) + self._config_persister() def _load_gcp_token(self, provider): if (('config' not in provider) or @@ -281,7 +281,7 @@ def _refresh_gcp_token(self): provider.value['access-token'] = credentials.token provider.value['expiry'] = format_rfc3339(credentials.expiry) if self._config_persister: - self._config_persister(self._config.value) + self._config_persister() def _load_oid_token(self, provider): if 'config' not in provider: @@ -322,7 +322,7 @@ def _load_oid_token(self, provider): self._refresh_oidc(provider) if self._config_persister: - self._config_persister(self._config.value) + self._config_persister() self.token = "Bearer %s" % provider['config']['id-token'] @@ -615,7 +615,7 @@ def _get_kube_config_loader_for_yaml_file( kcfg = KubeConfigMerger(filename) if persist_config and 'config_persister' not in kwargs: - kwargs['config_persister'] = kcfg.save_changes() + kwargs['config_persister'] = kcfg.save_changes if kcfg.config is None: raise ConfigException(