From bcf32999229cd86fef60d08115a49d51c6431924 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Tue, 2 Jan 2024 15:56:30 -0800 Subject: [PATCH 1/2] Fix bug for K8s API servers behind proxy --- src/k8s.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k8s.rs b/src/k8s.rs index 0fdc91d..621bce9 100644 --- a/src/k8s.rs +++ b/src/k8s.rs @@ -311,7 +311,7 @@ impl Context { ) -> Result, ClickError> { let (parts, body) = k8sreq.into_parts(); - let url = self.endpoint.join(&parts.uri.to_string())?; + let url = Url::parse(&format!("{}{}", self.endpoint, parts.uri))?; let new_provider = { // TODO: Fix this mess From 2f5b4251615c1ba6a3c1650e0a071af10e1e5772 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 3 Jan 2024 10:59:55 -0800 Subject: [PATCH 2/2] Fix the second use of url --- src/k8s.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k8s.rs b/src/k8s.rs index 621bce9..0b976a4 100644 --- a/src/k8s.rs +++ b/src/k8s.rs @@ -380,7 +380,7 @@ impl Context { ) -> Result { let (parts, body) = k8sreq.into_parts(); - let url = self.endpoint.join(&parts.uri.to_string())?; + let url = Url::parse(&format!("{}{}", self.endpoint, parts.uri))?; if let Some(UserAuth::ExecProvider(ref exec_provider)) = *self.auth.borrow() { self.handle_exec_provider(exec_provider);