[bridge] Hide class registration with feature flag

Author: Furisto

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

@@ -35,7 +35,12 @@ import {
     UpdateResponse,
     AdmissionConstraint as GRPCAdmissionConstraint,
 } from "@gitpod/ws-manager-bridge-api/lib";
-import { DescribeClusterRequest, DescribeClusterResponse, WorkspaceClass } from "@gitpod/ws-manager/lib";
+import {
+    DescribeClusterRequest,
+    DescribeClusterResponse,
+    GetWorkspacesRequest,
+    WorkspaceClass,
+} from "@gitpod/ws-manager/lib";
 import { WorkspaceManagerClientProvider } from "@gitpod/ws-manager/lib/client-provider";
 import {
     WorkspaceManagerClientProviderCompositeSource,
@@ -46,6 +51,7 @@ import { ServiceError as grpcServiceError } from "@grpc/grpc-js";
 import { inject, injectable } from "inversify";
 import { BridgeController } from "./bridge-controller";
 import { Configuration } from "./config";
+import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
 
 export interface ClusterServiceServerOptions {
     port: number;
@@ -149,8 +155,32 @@ export class ClusterService implements IClusterServiceServer {
                     tls,
                 };
 
-                let classConstraints = await getSupportedWorkspaceClasses(this.clientProvider, newCluster);
-                newCluster.admissionConstraints = admissionConstraints.concat(classConstraints);
+                const enabled = await getExperimentsClientForBackend().getValueAsync(
+                    "workspace_classes_backend",
+                    false,
+                    {},
+                );
+                if (enabled) {
+                    let classConstraints = await getSupportedWorkspaceClasses(this.clientProvider, newCluster);
+                    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.createClient(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 });
@@ -433,8 +463,11 @@ export class ClusterSyncService {
 
     protected timer: NodeJS.Timer;
 
-    public start() {
-        this.timer = setInterval(() => this.reconcile(), this.config.clusterSyncIntervalSeconds * 1000);
+    public async start() {
+        const enabled = await getExperimentsClientForBackend().getValueAsync("workspace_classes_backend", false, {});
+        if (enabled) {
+            this.timer = setInterval(() => this.reconcile(), this.config.clusterSyncIntervalSeconds * 1000);
+        }
     }
 
     private async reconcile() {
@@ -453,8 +486,11 @@ export class ClusterSyncService {
         log.debug("done reconciling workspace classes");
     }
 
-    public stop() {
-        clearInterval(this.timer);
+    public async stop() {
+        const enabled = await getExperimentsClientForBackend().getValueAsync("workspace_classes_backend", false, {});
+        if (enabled) {
+            clearInterval(this.timer);
+        }
     }
 }
 

install/installer/pkg/common/common.go

@@ -263,6 +263,27 @@ func DatabaseEnv(cfg *config.Config) (res []corev1.EnvVar) {
 	return envvars
 }
 
+func ConfigcatEnv(ctx *RenderContext) []corev1.EnvVar {
+	var sdkKey string
+	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
+		if cfg.WebApp != nil && cfg.WebApp.ConfigcatKey != "" {
+			sdkKey = cfg.WebApp.ConfigcatKey
+		}
+		return nil
+	})
+
+	if sdkKey == "" {
+		return nil
+	}
+
+	return []corev1.EnvVar{
+		{
+			Name:  "CONFIGCAT_SDK_KEY",
+			Value: sdkKey,
+		},
+	}
+}
+
 func DatabaseWaiterContainer(ctx *RenderContext) *corev1.Container {
 	return &corev1.Container{
 		Name:  "database-waiter",

install/installer/pkg/components/server/deployment.go

@@ -77,7 +77,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		common.WebappTracingEnv(ctx),
 		common.AnalyticsEnv(&ctx.Config),
 		common.MessageBusEnv(&ctx.Config),
-		configcatEnv(ctx),
+		common.ConfigcatEnv(ctx),
 		[]corev1.EnvVar{
 			{
 				Name:  "CONFIG_PATH",
@@ -402,24 +402,3 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 		},
 	}, nil
 }
-
-func configcatEnv(ctx *common.RenderContext) []corev1.EnvVar {
-	var sdkKey string
-	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
-		if cfg.WebApp != nil && cfg.WebApp.ConfigcatKey != "" {
-			sdkKey = cfg.WebApp.ConfigcatKey
-		}
-		return nil
-	})
-
-	if sdkKey == "" {
-		return nil
-	}
-
-	return []corev1.EnvVar{
-		{
-			Name:  "CONFIGCAT_SDK_KEY",
-			Value: sdkKey,
-		},
-	}
-}

install/installer/pkg/components/ws-manager-bridge/deployment.go

@@ -130,6 +130,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 								common.AnalyticsEnv(&ctx.Config),
 								common.MessageBusEnv(&ctx.Config),
 								common.DatabaseEnv(&ctx.Config),
+								common.ConfigcatEnv(ctx),
 								[]corev1.EnvVar{{
 									Name:  "WSMAN_BRIDGE_CONFIGPATH",
 									Value: "/config/ws-manager-bridge.json",