hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

set cwd when spawning kube auth proxy (#7069)

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2023-01-31 18:23:29 +02:00 committed by GitHub
parent 9ca8dc86fd
commit d3c4816e4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts
View File

@ -12,6 +12,7 @@ import loggerInjectable from "../../common/logger.injectable";
import waitUntilPortIsUsedInjectable from "./wait-until-port-is-used/wait-until-port-is-used.injectable"; import waitUntilPortIsUsedInjectable from "./wait-until-port-is-used/wait-until-port-is-used.injectable";
import lensK8sProxyPathInjectable from "./lens-k8s-proxy-path.injectable"; import lensK8sProxyPathInjectable from "./lens-k8s-proxy-path.injectable";
import getPortFromStreamInjectable from "../utils/get-port-from-stream.injectable"; import getPortFromStreamInjectable from "../utils/get-port-from-stream.injectable";
import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
export type CreateKubeAuthProxy = (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => KubeAuthProxy; export type CreateKubeAuthProxy = (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => KubeAuthProxy;
@ -25,6 +26,7 @@ const createKubeAuthProxyInjectable = getInjectable({
logger: di.inject(loggerInjectable), logger: di.inject(loggerInjectable),
waitUntilPortIsUsed: di.inject(waitUntilPortIsUsedInjectable), waitUntilPortIsUsed: di.inject(waitUntilPortIsUsedInjectable),
getPortFromStream: di.inject(getPortFromStreamInjectable), getPortFromStream: di.inject(getPortFromStreamInjectable),
dirname: di.inject(getDirnameOfPathInjectable),
}; };
return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => { return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => {

3
packages/core/src/main/kube-auth-proxy/kube-auth-proxy.ts
View File

@ -14,6 +14,7 @@ import { TypedRegEx } from "typed-regex";
import type { Spawn } from "../child-process/spawn.injectable"; import type { Spawn } from "../child-process/spawn.injectable";
import type { Logger } from "../../common/logger"; import type { Logger } from "../../common/logger";
import type { WaitUntilPortIsUsed } from "./wait-until-port-is-used/wait-until-port-is-used.injectable"; import type { WaitUntilPortIsUsed } from "./wait-until-port-is-used/wait-until-port-is-used.injectable";
import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable";
const startingServeMatcher = "starting to serve on (?<address>.+)"; const startingServeMatcher = "starting to serve on (?<address>.+)";
const startingServeRegex = Object.assign(TypedRegEx(startingServeMatcher, "i"), { const startingServeRegex = Object.assign(TypedRegEx(startingServeMatcher, "i"), {
@ -27,6 +28,7 @@ export interface KubeAuthProxyDependencies {
spawn: Spawn; spawn: Spawn;
waitUntilPortIsUsed: WaitUntilPortIsUsed; waitUntilPortIsUsed: WaitUntilPortIsUsed;
getPortFromStream: GetPortFromStream; getPortFromStream: GetPortFromStream;
dirname: GetDirnameOfPath;
} }
export class KubeAuthProxy { export class KubeAuthProxy {
@ -69,6 +71,7 @@ export class KubeAuthProxy {
PROXY_KEY: cert.private, PROXY_KEY: cert.private,
PROXY_CERT: cert.cert, PROXY_CERT: cert.cert,
}, },
cwd: this.dependencies.dirname(this.cluster.kubeConfigPath),
}); });
this.proxyProcess.on("error", (error) => { this.proxyProcess.on("error", (error) => {
this.cluster.broadcastConnectUpdate(error.message, "error"); this.cluster.broadcastConnectUpdate(error.message, "error");