Support window nodes for node-shells (#3624)

* Support window nodes for node-shells

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Also check beta.kubernetes/os label

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Add comment about linux fallback

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/common/k8s-api/endpoints/nodes.api.ts

@@ -236,13 +236,10 @@ export class Node extends KubeObject {
   }
 
   getOperatingSystem(): string {
-    const label = this.getLabels().find(label => label.startsWith("kubernetes.io/os="));
+    return this.metadata?.labels?.["kubernetes.io/os"]
-
+      || this.metadata?.labels?.["beta.kubernetes.io/os"]
-    if (label) {
+      || this.status?.nodeInfo?.operatingSystem
-      return label.split("=", 2)[1];
+      || "linux";
-    }
-
-    return "linux";
   }
 
   isUnschedulable() {

src/common/k8s-api/kube-api.ts

@@ -224,10 +224,7 @@ export class KubeApi<T extends KubeObject> {
       isNamespaced = options.objectConstructor?.namespaced,
     } = options || {};
 
-    if (!options.apiBase) {
+    const { apiBase, apiPrefix, apiGroup, apiVersion, resource } = parseKubeApi(options.apiBase || objectConstructor.apiBase);
-      options.apiBase = objectConstructor.apiBase;
-    }
-    const { apiBase, apiPrefix, apiGroup, apiVersion, resource } = parseKubeApi(options.apiBase);
 
     this.kind = kind;
     this.isNamespaced = isNamespaced;

src/common/k8s-api/kube-json-api.ts

@@ -21,6 +21,9 @@
 
 import { JsonApi, JsonApiData, JsonApiError } from "./json-api";
 import type { Response } from "node-fetch";
+import type { Cluster } from "../../main/cluster";
+import { LensProxy } from "../../main/lens-proxy";
+import { apiKubePrefix, isDebugging } from "../vars";
 
 export interface KubeJsonApiListMetadata {
   resourceVersion: string;
@@ -70,6 +73,20 @@ export interface KubeJsonApiError extends JsonApiError {
 }
 
 export class KubeJsonApi extends JsonApi<KubeJsonApiData> {
+  static forCluster(cluster: Cluster): KubeJsonApi {
+    const port = LensProxy.getInstance().port;
+
+    return new this({
+      serverAddress: `http://127.0.0.1:${port}`,
+      apiBase: apiKubePrefix,
+      debug: isDebugging,
+    }, {
+      headers: {
+        "Host": `${cluster.id}.localhost:${port}`,
+      },
+    });
+  }
+
   protected parseError(error: KubeJsonApiError | any, res: Response): string[] {
     const { status, reason, message } = error;
 
@@ -80,4 +97,3 @@ export class KubeJsonApi extends JsonApi<KubeJsonApiData> {
     return super.parseError(error, res);
   }
 }
-

src/main/cluster-manager.ts

@@ -240,28 +240,21 @@ export class ClusterManager extends Singleton {
   }
 
   getClusterForRequest(req: http.IncomingMessage): Cluster {
-    let cluster: Cluster = null;
-
     // lens-server is connecting to 127.0.0.1:<port>/<uid>
     if (req.headers.host.startsWith("127.0.0.1")) {
       const clusterId = req.url.split("/")[1];
-
+      const cluster = this.store.getById(clusterId);
-      cluster = this.store.getById(clusterId);
 
       if (cluster) {
         // we need to swap path prefix so that request is proxied to kube api
         req.url = req.url.replace(`/${clusterId}`, apiKubePrefix);
       }
-    } else if (req.headers["x-cluster-id"]) {
-      cluster = this.store.getById(req.headers["x-cluster-id"].toString());
-    } else {
-      const clusterId = getClusterIdFromHost(req.headers.host);
-
-      cluster = this.store.getById(clusterId);
-    }
 
       return cluster;
     }
+
+    return this.store.getById(getClusterIdFromHost(req.headers.host));
+  }
 }
 
 export function catalogEntityFromCluster(cluster: Cluster) {

src/main/shell-session/node-shell-session.ts

@@ -26,6 +26,9 @@ import type { KubeConfig } from "@kubernetes/client-node";
 import type { Cluster } from "../cluster";
 import { ShellOpenError, ShellSession } from "./shell-session";
 import { get } from "lodash";
+import { Node, NodesApi } from "../../common/k8s-api/endpoints";
+import { KubeJsonApi } from "../../common/k8s-api/kube-json-api";
+import logger from "../logger";
 
 export class NodeShellSession extends ShellSession {
   ShellType = "node-shell";
@@ -55,10 +58,27 @@ export class NodeShellSession extends ShellSession {
       throw new ShellOpenError("failed to create node pod", error);
     }
 
-    const args = ["exec", "-i", "-t", "-n", "kube-system", this.podId, "--", "sh", "-c", "((clear && bash) || (clear && ash) || (clear && sh))"];
     const env = await this.getCachedShellEnv();
+    const args = ["exec", "-i", "-t", "-n", "kube-system", this.podId, "--"];
+    const nodeApi = new NodesApi({
+      objectConstructor: Node,
+      request: KubeJsonApi.forCluster(this.cluster),
+    });
+    const node = await nodeApi.get({ name: this.nodeName });
+    const nodeOs = node.getOperatingSystem();
 
-    await super.open(shell, args, env);
+    switch (nodeOs) {
+      default:
+        logger.warn(`[NODE-SHELL-SESSION]: could not determine node OS, falling back with assumption of linux`);
+      case "linux":
+        args.push("sh", "-c", "((clear && bash) || (clear && ash) || (clear && sh))");
+        break;
+      case "windows":
+        args.push("powershell");
+        break;
+    }
+
+    return super.open(shell, args, env);
   }
 
   protected createNodeShellPod() {