[wsman-bridge] Remove worksplace classes feature flag (#17952)

Author: Furisto

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

@@ -40,11 +40,9 @@ import {
 import * as grpc from "@grpc/grpc-js";
 import { inject, injectable } from "inversify";
 import { BridgeController } from "./bridge-controller";
-import { getSupportedWorkspaceClasses } from "./cluster-sync-service";
 import { Configuration } from "./config";
 import { GRPCError } from "./rpc";
 import { isWorkspaceRegion } from "@gitpod/gitpod-protocol/lib/workspace-cluster";
-import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
 import { GetWorkspacesRequest, WorkspaceManagerClient } from "@gitpod/ws-manager/lib";
 
 export interface ClusterServiceServerOptions {
@@ -148,34 +146,25 @@ export class ClusterService implements IClusterServiceServer {
                     maxScore: 100,
                     govern,
                     tls,
+                    admissionConstraints,
                 };
 
-                const enabled = await getExperimentsClientForBackend().getValueAsync(
-                    "workspace_classes_backend",
-                    false,
-                    {},
-                );
-                if (enabled) {
-                    let classConstraints = await getSupportedWorkspaceClasses(this.clientProvider, newCluster, false);
-                    newCluster.admissionConstraints = admissionConstraints.concat(classConstraints);
-                } else {
-                    // try to connect to validate the config. Throws an exception if it fails.
-                    await new Promise<void>((resolve, reject) => {
-                        const c = this.clientProvider.createConnection(WorkspaceManagerClient, newCluster);
-                        c.getWorkspaces(new GetWorkspacesRequest(), (err: any) => {
-                            if (err) {
-                                reject(
-                                    new GRPCError(
-                                        grpc.status.FAILED_PRECONDITION,
-                                        `cannot reach ${req.url}: ${err.message}`,
-                                    ),
-                                );
-                            } else {
-                                resolve();
-                            }
-                        });
+                // try to connect to validate the config. Throws an exception if it fails.
+                await new Promise<void>((resolve, reject) => {
+                    const c = this.clientProvider.createConnection(WorkspaceManagerClient, newCluster);
+                    c.getWorkspaces(new GetWorkspacesRequest(), (err: any) => {
+                        if (err) {
+                            reject(
+                                new GRPCError(
+                                    grpc.status.FAILED_PRECONDITION,
+                                    `cannot reach ${req.url}: ${err.message}`,
+                                ),
+                            );
+                        } else {
+                            resolve();
+                        }
                     });
-                }
+                });
 
                 await this.clusterDB.save(newCluster);
                 log.info({}, "cluster registered", { cluster: req.name });

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

@@ -36,7 +36,6 @@ import { PrebuildUpdater, PrebuildUpdaterNoOp } from "./prebuild-updater";
 import { DebugApp } from "@gitpod/gitpod-protocol/lib/util/debug-app";
 import { Client } from "@gitpod/gitpod-protocol/lib/experiments/types";
 import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
-import { ClusterSyncService } from "./cluster-sync-service";
 import { WorkspaceInstanceController, WorkspaceInstanceControllerImpl } from "./workspace-instance-controller";
 import { AppClusterWorkspaceInstancesController } from "./app-cluster-instance-controller";
 
@@ -61,7 +60,6 @@ export const containerModule = new ContainerModule((bind) => {
 
     bind(ClusterServiceServer).toSelf().inSingletonScope();
     bind(ClusterService).toSelf().inRequestScope();
-    bind(ClusterSyncService).toSelf().inSingletonScope();
 
     bind(TracingManager).toSelf().inSingletonScope();
 

components/ws-manager-bridge/src/container-module.ts

@@ -14,7 +14,6 @@ import { TypeORM } from "@gitpod/gitpod-db/lib/typeorm/typeorm";
 import { TracingManager } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { ClusterServiceServer } from "./cluster-service-server";
 import { BridgeController } from "./bridge-controller";
-import { ClusterSyncService } from "./cluster-sync-service";
 import { AppClusterWorkspaceInstancesController } from "./app-cluster-instance-controller";
 
 log.enableJSONLogging("ws-manager-bridge", undefined, LogrusLogLevel.getFromEnv());
@@ -50,9 +49,6 @@ export const start = async (container: Container) => {
         const clusterServiceServer = container.get<ClusterServiceServer>(ClusterServiceServer);
         await clusterServiceServer.start();
 
-        const clusterSyncService = container.get<ClusterSyncService>(ClusterSyncService);
-        clusterSyncService.start();
-
         const appClusterInstanceController = container.get<AppClusterWorkspaceInstancesController>(
             AppClusterWorkspaceInstancesController,
         );