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

more cleanup/tweaking

Browse Source 
Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
This commit is contained in:
Jim Ehrismann 2021-10-06 17:18:00 -04:00
parent 4b8e1bac57
commit 8c35a416ff
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/routes/port-forward-route.ts
View File

@ -57,8 +57,7 @@ class PortForward {
public namespace: string; public namespace: string;
public name: string; public name: string;
public port: number; public port: number;
public internalPort?: number; public forwardPort: number;
public forwardPort?: number;
constructor(public kubeConfig: string, args: PortForwardArgs) { constructor(public kubeConfig: string, args: PortForwardArgs) {
this.clusterId = args.clusterId; this.clusterId = args.clusterId;
@ -91,14 +90,15 @@ class PortForward {
} }
}); });
this.internalPort = await getPortFrom(this.process.stdout, { const internalPort = await getPortFrom(this.process.stdout, {
lineRegex: internalPortRegex, lineRegex: internalPortRegex,
}); });
try { try {
await tcpPortUsed.waitUntilUsed(this.internalPort, 500, 15000); await tcpPortUsed.waitUntilUsed(internalPort, 500, 15000);
this.forwardPort = this.internalPort; // make sure this.forwardPort is set to the actual port used (if it was 0 then an available port is found by 'kubectl port-forward')
this.forwardPort = internalPort;
return true; return true;
} catch (error) { } catch (error) {
@ -154,7 +154,7 @@ export class PortForwardRoute {
} }
} }
respondJson(response, { port: portForward.internalPort }); respondJson(response, { port: portForward.forwardPort });
} catch (error) { } catch (error) {
logger.error(`[PORT-FORWARD-ROUTE]: failed to open a port-forward: ${error}`, { namespace, port, resourceType, resourceName }); logger.error(`[PORT-FORWARD-ROUTE]: failed to open a port-forward: ${error}`, { namespace, port, resourceType, resourceName });
@ -175,7 +175,7 @@ export class PortForwardRoute {
namespace, port, forwardPort namespace, port, forwardPort
}); });
respondJson(response, { port: portForward?.internalPort ?? null }); respondJson(response, { port: portForward?.forwardPort ?? null });
} }
static async routeAllPortForwards(request: LensApiRequest) { static async routeAllPortForwards(request: LensApiRequest) {

5
src/renderer/components/+network-services/service-port-component.tsx
View File

@ -88,10 +88,7 @@ export class ServicePortComponent extends React.Component<Props> {
}; };
this.waiting = true; this.waiting = true;
this.isPortForwarded = false;
if (!this.forwardPort) {
this.forwardPort = 0;
}
try { try {
this.forwardPort = await addPortForward(portForward); this.forwardPort = await addPortForward(portForward);

5
src/renderer/components/+workloads-pods/pod-container-port.tsx
View File

@ -92,10 +92,7 @@ export class PodContainerPort extends React.Component<Props> {
}; };
this.waiting = true; this.waiting = true;
this.isPortForwarded = false;
if (!this.forwardPort) {
this.forwardPort = 0;
}
try { try {
this.forwardPort = await addPortForward(portForward); this.forwardPort = await addPortForward(portForward);