[server config] Introduce isDedicatedInstallation, and use it to replace isSIngleOrgInstallation

incl. further cleanup around getConfiguration and server config

Author: geropl

components/gitpod-protocol/go/gitpod-service.go

@@ -1878,8 +1878,7 @@ type VSCodeConfig struct {
 
 // Configuration is the Configuration message type
 type Configuration struct {
-	DaysBeforeGarbageCollection float64 `json:"daysBeforeGarbageCollection,omitempty"`
-	GarbageCollectionStartDate  float64 `json:"garbageCollectionStartDate,omitempty"`
+	IsDedicatedInstallation bool `json:"isDedicatedInstallation,omitempty"`
 }
 
 // EnvVar is the EnvVar message type

components/gitpod-protocol/src/protocol.ts

@@ -1456,9 +1456,7 @@ export namespace AuthProviderEntry {
 }
 
 export interface Configuration {
-    readonly daysBeforeGarbageCollection: number;
-    readonly garbageCollectionStartDate: number;
-    readonly isSingleOrgInstallation: boolean;
+    readonly isDedicatedInstallation: boolean;
 }
 
 export interface StripeConfig {

components/server/src/auth/verification-service.ts

@@ -110,7 +110,7 @@ export class VerificationService {
     ) {
         if (this.config.twilioConfig) {
             this.verifyService = new TwilioVerificationEndpoint(this.config);
-        } else if (this.config.devBranch && !this.config.isSingleOrgInstallation) {
+        } else if (this.config.devBranch && !this.config.isDedicatedInstallation) {
             // preview environments get the mock verification endpoint
             this.verifyService = new MockVerificationEndpoint();
         }

components/server/src/config.ts

@@ -157,8 +157,6 @@ export interface ConfigSerialized {
         passlist: string[];
     };
 
-    showSetupModal: boolean;
-
     admin: {
         credentialsPath: string;
     };
@@ -274,7 +272,8 @@ export interface ConfigSerialized {
         address: string;
     };
 
-    isSingleOrgInstallation: boolean;
+    /** true if this is a Dedicated */
+    isDedicatedInstallation: boolean;
 }
 
 export interface CookieConfig {

components/server/src/workspace/gitpod-server-impl.ts

@@ -517,9 +517,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
     public async getConfiguration(ctx: TraceContext): Promise<Configuration> {
         return {
-            garbageCollectionStartDate: this.config.workspaceGarbageCollection.startDate,
-            daysBeforeGarbageCollection: this.config.workspaceGarbageCollection.minAgeDays,
-            isSingleOrgInstallation: this.config.isSingleOrgInstallation,
+            isDedicatedInstallation: this.config.isDedicatedInstallation,
         };
     }
 

dev/preview/workflow/preview/deploy-gitpod.sh

@@ -273,7 +273,7 @@ fi
 #
 if [[ "${GITPOD_WITH_DEDICATED_EMU}" == "true" ]]
 then
-  yq w -i "${INSTALLER_CONFIG_PATH}" experimental.webapp.server.isSingleOrgInstallation "true"
+  yq w -i "${INSTALLER_CONFIG_PATH}" experimental.webapp.server.isDedicatedInstallation "true"
 fi
 
 #

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

@@ -172,18 +172,10 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil
 	})
 
-	showSetupModal := true // old default to make self-hosted continue to work!
-	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
-		if cfg.WebApp != nil && cfg.WebApp.Server != nil && cfg.WebApp.Server.ShowSetupModal != nil {
-			showSetupModal = *cfg.WebApp.Server.ShowSetupModal
-		}
-		return nil
-	})
-
-	var isSingleOrgInstallation bool
+	var isDedicatedInstallation bool
 	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
 		if cfg.WebApp != nil && cfg.WebApp.Server != nil {
-			isSingleOrgInstallation = cfg.WebApp.Server.IsSingleOrgInstallation
+			isDedicatedInstallation = cfg.WebApp.Server.IsDedicatedInstallation || cfg.WebApp.Server.IsSingleOrgInstallation
 		}
 		return nil
 	})
@@ -296,10 +288,9 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		Admin: AdminConfig{
 			CredentialsPath: adminCredentialsPath,
 		},
-		ShowSetupModal:          showSetupModal,
 		Auth:                    authCfg,
 		Redis:                   redisConfig,
-		IsSingleOrgInstallation: isSingleOrgInstallation,
+		IsDedicatedInstallation: isDedicatedInstallation,
 	}
 
 	fc, err := common.ToJSONString(scfg)

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

@@ -39,9 +39,8 @@ type ConfigSerialized struct {
 	EnablePayment                     bool        `json:"enablePayment"`
 	LinkedInSecretsFile               string      `json:"linkedInSecretsFile"`
 	PATSigningKeyFile                 string      `json:"patSigningKeyFile"`
-	ShowSetupModal                    bool        `json:"showSetupModal"`
 	Auth                              auth.Config `json:"auth"`
-	IsSingleOrgInstallation           bool        `json:"isSingleOrgInstallation"`
+	IsDedicatedInstallation           bool        `json:"isDedicatedInstallation"`
 
 	WorkspaceHeartbeat         WorkspaceHeartbeat         `json:"workspaceHeartbeat"`
 	WorkspaceDefaults          WorkspaceDefaults          `json:"workspaceDefaults"`

install/installer/pkg/config/v1/experimental/experimental.go

@@ -269,8 +269,9 @@ type ServerConfig struct {
 	DisableWorkspaceGarbageCollection bool              `json:"disableWorkspaceGarbageCollection"`
 	DisableCompleteSnapshotJob        bool              `json:"disableCompleteSnapshotJob"`
 	InactivityPeriodForReposInDays    *int              `json:"inactivityPeriodForReposInDays"`
-	ShowSetupModal                    *bool             `json:"showSetupModal"`
-	IsSingleOrgInstallation           bool              `json:"isSingleOrgInstallation"`
+	// deprecated: use IsDedicatedInstallation instead
+	IsSingleOrgInstallation bool `json:"isSingleOrgInstallation"`
+	IsDedicatedInstallation bool `json:"isDedicatedInstallation"`
 
 	// @deprecated use containerRegistry.privateBaseImageAllowList instead
 	DefaultBaseImageRegistryWhiteList []string `json:"defaultBaseImageRegistryWhitelist"`