[server] Add config "experimantalNetwork" which translates to "WORKSP…

…ACEKIT_USE_NETNS"
gitpod-io · Oct 26, 2021 · 9b79e13 · 9b79e13
1 parent 77bd66a
commit 9b79e13
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/components/gitpod-protocol/data/gitpod-schema.json b/components/gitpod-protocol/data/gitpod-schema.json
@@ -206,6 +206,10 @@
                     }
                 }
             }
+        },
+        "experimentalNetwork": {
+            "type": "boolean",
+            "description": "Experimental network configuration in workspaces"
         }
     },
     "additionalProperties": false

diff --git a/components/gitpod-protocol/src/protocol.ts b/components/gitpod-protocol/src/protocol.ts
@@ -559,6 +559,9 @@ export interface WorkspaceConfig {
     github?: GithubAppConfig;
     vscode?: VSCodeConfig;
 
+    /** tailscale demo */
+    experimentalNetwork?: boolean;
+
     /**
      * Where the config object originates from.
      *

diff --git a/components/server/src/workspace/workspace-starter.ts b/components/server/src/workspace/workspace-starter.ts
@@ -637,6 +637,13 @@ export class WorkspaceStarter {
         vsxRegistryUrl.setValue(this.config.vsxRegistryUrl);
         envvars.push(vsxRegistryUrl);
 
+        if (workspace.config.experimentalNetwork) {
+            const useNetnsVar = new EnvironmentVariable();
+            useNetnsVar.setName("WORKSPACEKIT_USE_NETNS");
+            useNetnsVar.setValue("true");
+            envvars.push(useNetnsVar);
+        }
+
         const createGitpodTokenPromise = (async () => {
             const scopes = this.createDefaultGitpodAPITokenScopes(workspace, instance);
             const token = crypto.randomBytes(30).toString('hex');