[ws-manager-bridge] Remove HasUserLevel admission constraint

We never really used it and solved this case with other means
gitpod-io · Jul 14, 2022 · 68840d6 · 68840d6
1 parent 4692d0a
commit 68840d6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 30 deletions.
diff --git a/components/gitpod-protocol/src/workspace-cluster.ts b/components/gitpod-protocol/src/workspace-cluster.ts
@@ -56,12 +56,10 @@ export type WorkspaceManagerConnectionInfo = Pick<WorkspaceCluster, "name" | "ur
 export type AdmissionConstraint =
     | AdmissionConstraintFeaturePreview
     | AdmissionConstraintHasPermission
-    | AdmissionConstraintHasUserLevel
     | AdmissionConstraintHasMoreResources
     | AdmissionConstraintHasClass;
 export type AdmissionConstraintFeaturePreview = { type: "has-feature-preview" };
 export type AdmissionConstraintHasPermission = { type: "has-permission"; permission: PermissionName };
-export type AdmissionConstraintHasUserLevel = { type: "has-user-level"; level: string };
 export type AdmissionConstraintHasMoreResources = { type: "has-more-resources" };
 export type AdmissionConstraintHasClass = { type: "has-class"; id: string; displayName: string };
 

diff --git a/components/ws-manager-bridge-api/cluster-service.proto b/components/ws-manager-bridge-api/cluster-service.proto
@@ -58,7 +58,7 @@ message AdmissionConstraint {
   oneof constraint {
     FeaturePreview has_feature_preview = 1;
     HasPermission has_permission = 2;
-    string has_user_level = 3;
+    // deprecated anr removed: has_user_level = 3;
     bool has_more_resources = 4;
   }
 }

diff --git a/components/ws-manager-bridge/src/cluster-service-server.ts b/components/ws-manager-bridge/src/cluster-service-server.ts
@@ -15,7 +15,6 @@ import {
     AdmissionConstraint,
     AdmissionConstraintHasPermission,
     WorkspaceClusterWoTLS,
-    AdmissionConstraintHasUserLevel,
     AdmissionConstraintHasMoreResources,
 } from "@gitpod/gitpod-protocol/lib/workspace-cluster";
 import {
@@ -233,10 +232,6 @@ export class ClusterService implements IClusterServiceServer {
                                             return false;
                                         }
                                         break;
-                                    case "has-user-level":
-                                        if (v.level === (c as AdmissionConstraintHasUserLevel).level) {
-                                            return false;
-                                        }
                                     case "has-more-resources":
                                         return false;
                                 }
@@ -348,9 +343,6 @@ function convertToGRPC(ws: WorkspaceClusterWoTLS): ClusterStatus {
                 perm.setPermission(c.permission);
                 constraint.setHasPermission(perm);
                 break;
-            case "has-user-level":
-                constraint.setHasUserLevel(c.level);
-                break;
             case "has-more-resources":
                 constraint.setHasMoreResources(true);
                 break;
@@ -378,13 +370,6 @@ function mapAdmissionConstraint(c: GRPCAdmissionConstraint | undefined): Admissi
 
         return <AdmissionConstraintHasPermission>{ type: "has-permission", permission };
     }
-    if (c.hasHasUserLevel()) {
-        const level = c.getHasUserLevel();
-        if (!level) {
-            return;
-        }
-        return <AdmissionConstraintHasUserLevel>{ type: "has-user-level", level };
-    }
     if (c.hasHasMoreResources()) {
         return <AdmissionConstraintHasMoreResources>{ type: "has-more-resources" };
     }

diff --git a/dev/gpctl/cmd/clusters-update.go b/dev/gpctl/cmd/clusters-update.go
@@ -87,7 +87,7 @@ var clustersUpdateMaxScoreCmd = &cobra.Command{
 }
 
 var clustersUpdateAdmissionConstraintCmd = &cobra.Command{
-	Use:   "admission-constraint add|remove has-feature-preview|has-permission=<permission>|has-user-level=<level>|has-more-resources",
+	Use:   "admission-constraint add|remove has-feature-preview|has-permission=<permission>|has-more-resources",
 	Short: "Updates a cluster's admission constraints",
 	Args:  cobra.ExactArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
@@ -126,17 +126,6 @@ var clustersUpdateAdmissionConstraintCmd = &cobra.Command{
 					},
 				},
 			}
-		} else if strings.HasPrefix(args[1], "has-user-level=") {
-			request.Property = &api.UpdateRequest_AdmissionConstraint{
-				AdmissionConstraint: &api.ModifyAdmissionConstraint{
-					Add: add,
-					Constraint: &api.AdmissionConstraint{
-						Constraint: &api.AdmissionConstraint_HasUserLevel{
-							HasUserLevel: strings.TrimPrefix(args[1], "has-user-level="),
-						},
-					},
-				},
-			}
 		} else if strings.HasPrefix(args[1], "has-more-resources") {
 			request.Property = &api.UpdateRequest_AdmissionConstraint{
 				AdmissionConstraint: &api.ModifyAdmissionConstraint{