[db] Add applicationCluster field to d_b_workspace_cluster table

components/gitpod-db/src/typeorm/entity/db-workspace-cluster.ts

@@ -84,4 +84,10 @@ export class DBWorkspaceCluster implements WorkspaceCluster {
         })(),
     })
     admissionConstraints?: AdmissionConstraint[];
+
+    @Column({
+        type: "varchar",
+        length: 60,
+    })
+    applicationCluster: string;
 }

components/gitpod-db/src/typeorm/migration/1665071320428-AddColumnToWorkspaceClusterTable.ts

@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnToWorkspaceClusterTable1665071320428 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const installationShortname = process.env.GITPOD_INSTALLATION_SHORTNAME ?? "";
+
+        await queryRunner.query(
+            `ALTER TABLE d_b_workspace_cluster ADD COLUMN applicationCluster varchar(60) NOT NULL DEFAULT ''`,
+        );
+
+        await queryRunner.query(`UPDATE d_b_workspace_cluster SET applicationCluster = '${installationShortname}'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {}
+}

components/gitpod-db/src/typeorm/workspace-cluster-db-impl.ts

@@ -51,6 +51,7 @@ export class WorkspaceClusterDBImpl implements WorkspaceClusterDB {
             state: "available",
             govern: false,
             admissionConstraints: [],
+            applicationCluster: "",
         };
 
         const repo = await this.getRepo();

components/gitpod-protocol/src/workspace-cluster.ts

@@ -15,6 +15,10 @@ export interface WorkspaceCluster {
     // Must be identical to the installationShortname of the cluster it represents!
     name: string;
 
+    // The name of the application cluster to which this cluster should be registered.
+    // The name can be at most 60 characters.
+    applicationCluster: string;
+
     // URL of the cluster's ws-manager API
     url: string;
 

components/ws-manager-api/typescript/src/client-provider.spec.ts

@@ -39,6 +39,7 @@ class TestClientProvider {
                         state: "cordoned",
                         url: "",
                         admissionConstraints: [],
+                        applicationCluster: "xx01",
                     },
                     {
                         name: "c2",
@@ -48,6 +49,7 @@ class TestClientProvider {
                         state: "cordoned",
                         url: "",
                         admissionConstraints: [],
+                        applicationCluster: "xx01",
                     },
                     {
                         name: "c3",
@@ -57,6 +59,7 @@ class TestClientProvider {
                         state: "cordoned",
                         url: "",
                         admissionConstraints: [],
+                        applicationCluster: "xx01",
                     },
                     {
                         name: "a1",
@@ -66,6 +69,7 @@ class TestClientProvider {
                         state: "available",
                         url: "",
                         admissionConstraints: [],
+                        applicationCluster: "xx01",
                     },
                     {
                         name: "a2",
@@ -75,6 +79,7 @@ class TestClientProvider {
                         state: "available",
                         url: "",
                         admissionConstraints: [],
+                        applicationCluster: "xx01",
                     },
                     {
                         name: "a3",
@@ -84,6 +89,7 @@ class TestClientProvider {
                         state: "available",
                         url: "",
                         admissionConstraints: [],
+                        applicationCluster: "xx01",
                     },
                     {
                         name: "con1",
@@ -93,6 +99,7 @@ class TestClientProvider {
                         state: "available",
                         url: "",
                         admissionConstraints: [{ type: "has-permission", permission: "new-workspace-cluster" }],
+                        applicationCluster: "xx01",
                     },
                     {
                         name: "con2",
@@ -104,6 +111,7 @@ class TestClientProvider {
                         admissionConstraints: [
                             { type: "has-permission", permission: "monitor" }, // This is meant to representent a permission that does not take special predence (cmp. constraints.ts)
                         ],
+                        applicationCluster: "xx01",
                     },
                 ];
                 return <WorkspaceManagerClientProviderSource>{

components/ws-manager-bridge/src/cluster-service-server.ts

@@ -107,6 +107,14 @@ export class ClusterService implements IClusterServiceServer {
                     }
                 }
 
+                const applicationCluster = process.env.GITPOD_INSTALLATION_SHORTNAME;
+                if (applicationCluster === undefined) {
+                    throw new GRPCError(
+                        grpc.status.INTERNAL,
+                        "no GITPOD_INSTALLATION_SHORTNAME environment variable is set on the server",
+                    );
+                }
+
                 // store the ws-manager into the database
                 let perfereability = Preferability.NONE;
                 let govern = false;
@@ -141,6 +149,7 @@ export class ClusterService implements IClusterServiceServer {
                 const newCluster: WorkspaceCluster = {
                     name: req.name,
                     url: req.url,
+                    applicationCluster,
                     state,
                     score,
                     maxScore: 100,