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

Added ability to add custom port on pod and service port forwarding

Browse Source 
Signed-off-by: rdeepc <12953177+rdeepc@users.noreply.github.com>
This commit is contained in:
Saumya Shovan Roy 2021-07-06 23:50:09 -04:00 committed by rdeepc
parent 394ca5432d
commit 2376695e1d
3 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,10 +45,10 @@ class PortForward {
static getPortforward(forward: PortForwardArgs) { static getPortforward(forward: PortForwardArgs) {
return PortForward.portForwards.find((pf) => ( return PortForward.portForwards.find((pf) => (
pf.clusterId == forward.clusterId && pf.clusterId == forward.clusterId &&
pf.kind == forward.kind && pf.kind == forward.kind &&
pf.name == forward.name && pf.name == forward.name &&
pf.namespace == forward.namespace && pf.namespace == forward.namespace &&
pf.port == forward.port pf.port == forward.port
)); ));
} }
@ -59,7 +59,7 @@ class PortForward {
public name: string; public name: string;
public port: string; public port: string;
public internalPort?: number; public internalPort?: number;
public forwardPort?: string; public forwardPort: string;
constructor(public kubeConfig: string, args: PortForwardArgs) { constructor(public kubeConfig: string, args: PortForwardArgs) {
this.clusterId = args.clusterId; this.clusterId = args.clusterId;
@ -156,7 +156,7 @@ export class PortForwardRoute {
portForward.open(); portForward.open();
respondJson(response, {port: portForward.forwardPort}); respondJson(response, {port: portForward.forwardPort});
} catch (error) { } catch (e) {
return respondJson(response, { return respondJson(response, {
message: `Failed to forward port ${port} to ${forwardPort}` message: `Failed to forward port ${port} to ${forwardPort}`
}, 400); }, 400);
@ -172,7 +172,11 @@ export class PortForwardRoute {
namespace, port, forwardPort namespace, port, forwardPort
}); });
const forwardedPort = portForward?.forwardPort?? null; let forwardedPort = -1;
if (portForward) {
forwardedPort = Number(portForward.forwardPort);
}
respondJson(response, {port: forwardedPort}); respondJson(response, {port: forwardedPort});
} }
@ -186,11 +190,8 @@ export class PortForwardRoute {
namespace, port, forwardPort, namespace, port, forwardPort,
}); });
try { portForward.stop().then( () => {
await portForward.stop();
respondJson(response, {status: true}); respondJson(response, {status: true});
} catch (error) { }).catch(error => logger.error(error));
logger.error(error);
}
} }
} }

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

@ -43,7 +43,7 @@ interface PortForwardResult {
@observer @observer
export class ServicePortComponent extends React.Component<Props> { export class ServicePortComponent extends React.Component<Props> {
@observable waiting = false; @observable waiting = false;
@observable forwardPort: number | null; @observable forwardPort = -1;
@observable isPortForwarded = false; @observable isPortForwarded = false;
constructor(props: Props) { constructor(props: Props) {
@ -53,9 +53,7 @@ export class ServicePortComponent extends React.Component<Props> {
} }
init() { init() {
this.checkExistingPortForwarding().catch(error => { this.checkExistingPortForwarding().then();
console.error(error);
});
} }
async checkExistingPortForwarding() { async checkExistingPortForwarding() {
@ -64,7 +62,7 @@ export class ServicePortComponent extends React.Component<Props> {
const activePort = response.port; const activePort = response.port;
if (activePort) { if (activePort && activePort != -1) {
this.forwardPort = activePort; this.forwardPort = activePort;
this.isPortForwarded = true; this.isPortForwarded = true;
} }
@ -80,6 +78,7 @@ export class ServicePortComponent extends React.Component<Props> {
this.forwardPort = response.port; this.forwardPort = response.port;
this.isPortForwarded = true; this.isPortForwarded = true;
} catch(error) { } catch(error) {
Notifications.error(error); Notifications.error(error);
} finally { } finally {
@ -105,7 +104,7 @@ export class ServicePortComponent extends React.Component<Props> {
render() { render() {
const { port } = this.props; const { port } = this.props;
if (this.forwardPort == null) { if (this.forwardPort == -1) {
this.forwardPort = port.port; this.forwardPort = port.port;
} }

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

@ -47,7 +47,7 @@ interface PortForwardResult {
@observer @observer
export class PodContainerPort extends React.Component<Props> { export class PodContainerPort extends React.Component<Props> {
@observable waiting = false; @observable waiting = false;
@observable forwardPort: number | null; @observable forwardPort = -1;
@observable isPortForwarded = false; @observable isPortForwarded = false;
constructor(props: Props) { constructor(props: Props) {
@ -57,9 +57,7 @@ export class PodContainerPort extends React.Component<Props> {
} }
init() { init() {
this.checkExistingPortForwarding().catch(error => { this.checkExistingPortForwarding().then();
console.error(error);
});
} }
async checkExistingPortForwarding() { async checkExistingPortForwarding() {
@ -68,7 +66,7 @@ export class PodContainerPort extends React.Component<Props> {
const activePort = response.port; const activePort = response.port;
if (activePort) { if (activePort && activePort != -1) {
this.forwardPort = activePort; this.forwardPort = activePort;
this.isPortForwarded = true; this.isPortForwarded = true;
} }
@ -111,14 +109,14 @@ export class PodContainerPort extends React.Component<Props> {
const { name, containerPort, protocol } = port; const { name, containerPort, protocol } = port;
const text = `${name ? `${name}: ` : ""}${containerPort}/${protocol}`; const text = `${name ? `${name}: ` : ""}${containerPort}/${protocol}`;
if (this.forwardPort == null) { if (this.forwardPort == -1) {
this.forwardPort = containerPort; this.forwardPort = containerPort;
} }
const portForwardAction = async () => { const portForwardAction = async () => {
if (this.isPortForwarded) { if (this.isPortForwarded) {
await this.stopPortForward(); await this.stopPortForward();
} else { }else {
await this.portForward(); await this.portForward();
} }
}; };