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

Fix lens node shell (#2001)

Browse Source 
Signed-off-by: vshakirova <vshakirova@mirantis.com>
This commit is contained in:
Violetta 2021-04-01 18:27:37 +04:00 committed by GitHub
parent 04e5180511
commit 584e191326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/node-shell-session.ts
View File

@ -26,7 +26,7 @@ export class NodeShellSession extends ShellSession {
if (this.createNodeShellPod(this.podId, this.nodeName)) { if (this.createNodeShellPod(this.podId, this.nodeName)) {
await this.waitForRunningPod(this.podId).catch(() => { await this.waitForRunningPod(this.podId).catch(() => {
this.exit(1001); this.exitAndClean(1001);
}); });
} }
args = ["exec", "-i", "-t", "-n", "kube-system", this.podId, "--", "sh", "-c", "((clear && bash) || (clear && ash) || (clear && sh))"]; args = ["exec", "-i", "-t", "-n", "kube-system", this.podId, "--", "sh", "-c", "((clear && bash) || (clear && ash) || (clear && sh))"];
@ -49,11 +49,14 @@ export class NodeShellSession extends ShellSession {
appEventBus.emit({name: "node-shell", action: "open"}); appEventBus.emit({name: "node-shell", action: "open"});
} }
protected exit(code = 1000) { protected exitAndClean(code = 1000) {
if (this.podId) { if (this.podId) {
this.deleteNodeShellPod(); this.deleteNodeShellPod();
} }
super.exit(code);
if (code != 1000) {
this.sendResponse("Error occurred. ");
}
} }
protected async createNodeShellPod(podId: string, nodeName: string) { protected async createNodeShellPod(podId: string, nodeName: string) {
@ -65,6 +68,7 @@ export class NodeShellSession extends ShellSession {
namespace: "kube-system" namespace: "kube-system"
}, },
spec: { spec: {
nodeName,
restartPolicy: "Never", restartPolicy: "Never",
terminationGracePeriodSeconds: 0, terminationGracePeriodSeconds: 0,
hostPID: true, hostPID: true,
@ -82,9 +86,6 @@ export class NodeShellSession extends ShellSession {
command: ["nsenter"], command: ["nsenter"],
args: ["-t", "1", "-m", "-u", "-i", "-n", "sleep", "14000"] args: ["-t", "1", "-m", "-u", "-i", "-n", "sleep", "14000"]
}], }],
nodeSelector: {
"kubernetes.io/hostname": nodeName
}
} }
} as k8s.V1Pod; } as k8s.V1Pod;