[workspace cluster] Remove admission preferences

Author: csweichel

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

@@ -5,7 +5,7 @@
  */
 
 import { PrimaryColumn, Column, Entity, Index } from "typeorm";
-import { AdmissionConstraint, AdmissionPreference, TLSConfig, WorkspaceCluster, WorkspaceClusterState } from "@gitpod/gitpod-protocol/lib/workspace-cluster";
+import { AdmissionConstraint, TLSConfig, WorkspaceCluster, WorkspaceClusterState } from "@gitpod/gitpod-protocol/lib/workspace-cluster";
 import { ValueTransformer } from "typeorm/decorator/options/ValueTransformer";
 
 @Entity()
@@ -79,27 +79,4 @@ export class DBWorkspaceCluster implements WorkspaceCluster {
         })()
     })
     admissionConstraints?: AdmissionConstraint[];
-
-    @Column({
-        type: "simple-json",
-        transformer: (() => {
-            const defaultValue: AdmissionPreference[] = [];
-            const jsonifiedDefault = JSON.stringify(defaultValue);
-            return <ValueTransformer> {
-                to(value: any): any {
-                    if (!value) {
-                        return jsonifiedDefault;
-                    }
-                    return JSON.stringify(value);
-                },
-                from(value: any): any {
-                    if (!value) {
-                        return undefined;
-                    }
-                    return JSON.parse(value);
-                }
-            };
-        })()
-    })
-    admissionPreferences?: AdmissionPreference[];
 }

components/gitpod-db/src/typeorm/migration/1643724196672-RemoveAdmissionPreferences.ts

@@ -0,0 +1,23 @@
+/**
+ * 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";
+import { columnExists, tableExists } from "./helper/helper";
+
+export class RemoveAdmissionPreferences1643724196672 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        if (await tableExists(queryRunner, "d_b_workspace_cluster")) {
+            if (!(await columnExists(queryRunner, "d_b_workspace_cluster", "admissionPreferences"))) {
+                await queryRunner.query("ALTER TABLE d_b_workspace_cluster DROP COLUMN admissionPreferences");
+            }
+        }
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+    }
+
+}

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

@@ -49,7 +49,6 @@ import { WorkspaceCluster, WorkspaceClusterFilter, WorkspaceClusterWoTLS } from
             state: "available",
             govern: false,
             admissionConstraints: [],
-            admissionPreferences: [],
         };
 
         const repo = await this.getRepo();

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

@@ -35,9 +35,6 @@ export interface WorkspaceCluster {
 
     // An optional set of constraints that limit who can start workspaces on the cluster
     admissionConstraints?: AdmissionConstraint[];
-
-    // An optional set of admission preferences that guide cluster selection
-    admissionPreferences?: AdmissionPreference[];
 }
 
 export type WorkspaceClusterState = "available" | "cordoned" | "draining";

components/ws-manager-bridge-api/cluster-service.proto

@@ -21,7 +21,10 @@ message RegisterRequest {
   TlsConfig tls = 3;
   RegistrationHints hints = 4;
   repeated AdmissionConstraint admission_constraints = 5;
-  repeated AdmissionPreference admission_preference = 6;
+
+  // DEPRECATED
+  // repeated AdmissionPreference admission_preference = 6;
+  reserved 6;
 }
 
 message RegisterResponse {}
@@ -51,12 +54,6 @@ message AdmissionConstraint {
   }
 }
 
-message AdmissionPreference {
-  oneof preference {
-    string user_level = 1;
-  }
-}
-
 enum Preferability {
   None = 0;
   Prefer = 1;
@@ -71,8 +68,11 @@ message ClusterStatus {
   int32 max_score = 5;
   bool governed = 6;
   repeated AdmissionConstraint admission_constraint = 7;
-  repeated AdmissionPreference admission_preference = 9;
   bool static = 8;
+
+  // DEPRECATED
+  // repeated AdmissionPreference admission_preference = 9;
+  reserved 9;
 }
 
 enum ClusterState {
@@ -89,7 +89,9 @@ message UpdateRequest {
     int32 max_score = 3;
     bool cordoned = 4;
     ModifyAdmissionConstraint admission_constraint = 5;
-    ModifyAdmissionPreference admission_preference = 6;
+
+    // DEPRECATED
+    // ModifyAdmissionPreference admission_preference = 6;
   }
 }
 
@@ -98,11 +100,6 @@ message ModifyAdmissionConstraint {
   AdmissionConstraint constraint = 2;
 }
 
-message ModifyAdmissionPreference {
-  bool add = 1;
-  AdmissionPreference preference = 2;
-}
-
 message UpdateResponse {}
 
 message DeregisterRequest {