From df1b0c156f2b9cdc61c2ecdb59c03efa2eec43fb Mon Sep 17 00:00:00 2001 From: Tomas Aschan Date: Wed, 29 Jan 2025 14:57:38 +0100 Subject: [PATCH 1/3] Tweak test to fail like the production code does --- kubernetes/base/config/exec_provider_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/base/config/exec_provider_test.py b/kubernetes/base/config/exec_provider_test.py index 9ff62d12e2..fc4944b229 100644 --- a/kubernetes/base/config/exec_provider_test.py +++ b/kubernetes/base/config/exec_provider_test.py @@ -175,7 +175,7 @@ def test_with_cluster_info(self, mock): instance = mock.return_value instance.wait.return_value = 0 instance.communicate.return_value = (self.output_ok, '') - ep = ExecProvider(self.input_with_cluster, None, {'server': 'name.company.com'}) + ep = ExecProvider(self.input_with_cluster, None, ConfigNode("cluster", {'server': 'name.company.com'})) result = ep.run() self.assertTrue(isinstance(result, dict)) self.assertTrue('token' in result) From f64be15641f778abccae15d07bf1b9fc8e0e6d87 Mon Sep 17 00:00:00 2001 From: Tomas Aschan Date: Wed, 29 Jan 2025 15:00:41 +0100 Subject: [PATCH 2/3] fix: Extract value from ConfigNode before storing it --- kubernetes/base/config/exec_provider.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/base/config/exec_provider.py b/kubernetes/base/config/exec_provider.py index 317a566955..dad60f9543 100644 --- a/kubernetes/base/config/exec_provider.py +++ b/kubernetes/base/config/exec_provider.py @@ -54,7 +54,7 @@ def __init__(self, exec_config, cwd, cluster=None): additional_vars[name] = value self.env.update(additional_vars) if exec_config.safe_get('provideClusterInfo'): - self.cluster = cluster + self.cluster = cluster.value else: self.cluster = None self.cwd = cwd or None From a588f513282a11908382830bec90c8f7c9d23a75 Mon Sep 17 00:00:00 2001 From: Tomas Aschan Date: Fri, 14 Feb 2025 15:43:39 +0100 Subject: [PATCH 3/3] Address review feedback --- kubernetes/base/config/exec_provider.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/base/config/exec_provider.py b/kubernetes/base/config/exec_provider.py index dad60f9543..03dc0386ef 100644 --- a/kubernetes/base/config/exec_provider.py +++ b/kubernetes/base/config/exec_provider.py @@ -54,7 +54,7 @@ def __init__(self, exec_config, cwd, cluster=None): additional_vars[name] = value self.env.update(additional_vars) if exec_config.safe_get('provideClusterInfo'): - self.cluster = cluster.value + self.cluster = cluster else: self.cluster = None self.cwd = cwd or None @@ -71,7 +71,7 @@ def run(self, previous_response=None): if previous_response: kubernetes_exec_info['spec']['response'] = previous_response if self.cluster: - kubernetes_exec_info['spec']['cluster'] = self.cluster + kubernetes_exec_info['spec']['cluster'] = self.cluster.value self.env['KUBERNETES_EXEC_INFO'] = json.dumps(kubernetes_exec_info) process = subprocess.Popen(