From 8f6ffd1cc7af5098f788354257fd19e30bbb1869 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 2 Jun 2022 18:34:40 -0400 Subject: [PATCH] Fix cluster server path being duplicated by proxy - This resolves an issue with non-Rancher clusters that have been added to Rancher, for some reason this causes the server path to be duplicated in that case. Other connection types don't seem to be affected either way. Signed-off-by: Sebastian Malton --- src/main/context-handler/context-handler.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/context-handler/context-handler.ts b/src/main/context-handler/context-handler.ts index cf35a0a67c..3ab4fc3ca7 100644 --- a/src/main/context-handler/context-handler.ts +++ b/src/main/context-handler/context-handler.ts @@ -152,9 +152,6 @@ export class ContextHandler implements ClusterContextHandler { protected async newApiTarget(timeout: number): Promise { const kubeAuthProxy = await this.ensureServerHelper(); - const ca = this.resolveAuthProxyCa(); - const clusterPath = this.clusterUrl.path !== "/" ? this.clusterUrl.path : ""; - const apiPrefix = `${kubeAuthProxy.apiPrefix}${clusterPath}`; const headers: Record = {}; if (this.clusterUrl.hostname) { @@ -166,8 +163,8 @@ export class ContextHandler implements ClusterContextHandler { protocol: "https:", host: "127.0.0.1", port: kubeAuthProxy.port, - path: apiPrefix, - ca, + path: kubeAuthProxy.apiPrefix, + ca: this.resolveAuthProxyCa(), }, changeOrigin: true, timeout,