[installer] Actually add 'inactivityPeriodForReposInDays' to server configmap

components/server/ee/src/prebuilds/prebuild-manager.ts

@@ -406,17 +406,18 @@ export class PrebuildManager {
 
     private async shouldSkipInactiveRepository(ctx: TraceContext, cloneURL: string): Promise<boolean> {
         const span = TraceContext.startSpan("shouldSkipInactiveRepository", ctx);
-        const { inactivityPeriodForRepos } = this.config;
-        if (!inactivityPeriodForRepos) {
-            // skipping is disabled if `inactivityPeriodForRepos` is not set
+        const { inactivityPeriodForReposInDays } = this.config;
+        if (!inactivityPeriodForReposInDays) {
+            // skipping is disabled if `inactivityPeriodForReposInDays` is not set
             span.finish();
             return false;
         }
         try {
             return (
                 (await this.workspaceDB
                     .trace({ span })
-                    .getWorkspaceCountByCloneURL(cloneURL, inactivityPeriodForRepos /* in days */, "regular")) === 0
+                    .getWorkspaceCountByCloneURL(cloneURL, inactivityPeriodForReposInDays /* in days */, "regular")) ===
+                0
             );
         } catch (error) {
             log.error("cannot compute activity for repository", { cloneURL }, error);

components/server/src/config.ts

@@ -29,7 +29,7 @@ export type Config = Omit<
     stripeSecrets?: { publishableKey: string; secretKey: string };
     stripeConfig?: StripeConfig;
     builtinAuthProvidersConfigured: boolean;
-    inactivityPeriodForRepos?: number;
+    inactivityPeriodForReposInDays?: number;
 };
 
 export interface WorkspaceDefaults {
@@ -203,7 +203,7 @@ export interface ConfigSerialized {
      * If a numeric value interpreted as days is set, repositories not beeing opened with Gitpod are
      * considered inactive.
      */
-    inactivityPeriodForRepos?: number;
+    inactivityPeriodForReposInDays?: number;
 
     /**
      * Supported workspace classes
@@ -285,10 +285,10 @@ export namespace ConfigFile {
         if (licenseFile) {
             license = fs.readFileSync(filePathTelepresenceAware(licenseFile), "utf-8");
         }
-        let inactivityPeriodForRepos: number | undefined;
-        if (typeof config.inactivityPeriodForRepos === "number") {
-            if (config.inactivityPeriodForRepos >= 1) {
-                inactivityPeriodForRepos = config.inactivityPeriodForRepos;
+        let inactivityPeriodForReposInDays: number | undefined;
+        if (typeof config.inactivityPeriodForReposInDays === "number") {
+            if (config.inactivityPeriodForReposInDays >= 1) {
+                inactivityPeriodForReposInDays = config.inactivityPeriodForReposInDays;
             }
         }
 
@@ -320,7 +320,7 @@ export namespace ConfigFile {
                     ? new Date(config.workspaceGarbageCollection.startDate).getTime()
                     : Date.now(),
             },
-            inactivityPeriodForRepos,
+            inactivityPeriodForReposInDays,
         };
     }
 }

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

@@ -176,6 +176,14 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil
 	})
 
+	inactivityPeriodForReposInDays := 0
+	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
+		if cfg.WebApp != nil && cfg.WebApp.Server != nil && cfg.WebApp.Server.InactivityPeriodForReposInDays != nil {
+			inactivityPeriodForReposInDays = *cfg.WebApp.Server.InactivityPeriodForReposInDays
+		}
+		return nil
+	})
+
 	// todo(sje): all these values are configurable
 	scfg := ConfigSerialized{
 		Version:               ctx.VersionManifest.Version,
@@ -263,7 +271,8 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 			// default limit for all cloneURLs
 			"*": 50,
 		},
-		WorkspaceClasses: workspaceClasses,
+		WorkspaceClasses:               workspaceClasses,
+		InactivityPeriodForReposInDays: inactivityPeriodForReposInDays,
 	}
 
 	fc, err := common.ToJSONString(scfg)

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

@@ -52,8 +52,9 @@ type ConfigSerialized struct {
 	CodeSync                   CodeSync                   `json:"codeSync"`
 	// PrebuildLimiter defines the number of prebuilds allowed for each cloneURL in a given 1 minute interval
 	// Key of "*" defines the default limit, unless there exists a cloneURL in the map which overrides it.
-	PrebuildLimiter  map[string]int   `json:"prebuildLimiter"`
-	WorkspaceClasses []WorkspaceClass `json:"workspaceClasses"`
+	PrebuildLimiter                map[string]int   `json:"prebuildLimiter"`
+	WorkspaceClasses               []WorkspaceClass `json:"workspaceClasses"`
+	InactivityPeriodForReposInDays int              `json:"inactivityPeriodForReposInDays"`
 }
 type CodeSyncResources struct {
 	RevLimit int32 `json:"revLimit"`

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

@@ -232,6 +232,7 @@ type ServerConfig struct {
 	EnableLocalApp                    *bool             `json:"enableLocalApp"`
 	RunDbDeleter                      *bool             `json:"runDbDeleter"`
 	DisableWorkspaceGarbageCollection bool              `json:"disableWorkspaceGarbageCollection"`
+	InactivityPeriodForReposInDays    *int              `json:"inactivityPeriodForReposInDays"`
 
 	// @deprecated use containerRegistry.privateBaseImageAllowList instead
 	DefaultBaseImageRegistryWhiteList []string `json:"defaultBaseImageRegistryWhitelist"`