Make runDbDeleter configurable

Take the value from the experimental server config rather than hardcoding to `true`.
gitpod-io · May 4, 2022 · 10e5932 · 10e5932
1 parent ca76283
commit 10e5932
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/install/installer/pkg/components/server/configmap.go b/install/installer/pkg/components/server/configmap.go
@@ -64,6 +64,14 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil
 	})
 
+	runDbDeleter := true
+	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
+		if cfg.WebApp != nil && cfg.WebApp.Server != nil {
+			runDbDeleter = cfg.WebApp.Server.RunDbDeleter
+		}
+		return nil
+	})
+
 	defaultBaseImageRegistryWhitelist := []string{}
 	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
 		if cfg.WebApp != nil && cfg.WebApp.Server != nil {
@@ -147,7 +155,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		BlockNewUsers:                     ctx.Config.BlockNewUsers,
 		MakeNewUsersAdmin:                 false,
 		DefaultBaseImageRegistryWhitelist: defaultBaseImageRegistryWhitelist,
-		RunDbDeleter:                      true,
+		RunDbDeleter:                      runDbDeleter,
 		OAuthServer: OAuthServer{
 			Enabled:   true,
 			JWTSecret: jwtSecret,

diff --git a/install/installer/pkg/components/server/configmap_test.go b/install/installer/pkg/components/server/configmap_test.go
@@ -19,6 +19,7 @@ import (
 func TestConfigMap(t *testing.T) {
 	type Expectation struct {
 		EnableLocalApp                    bool
+		RunDbDeleter                      bool
 		DisableDynamicAuthProviderLogin   bool
 		DefaultBaseImageRegistryWhiteList []string
 		WorkspaceImage                    string
@@ -30,6 +31,7 @@ func TestConfigMap(t *testing.T) {
 	expectation := Expectation{
 		EnableLocalApp:                    true,
 		DisableDynamicAuthProviderLogin:   true,
+		RunDbDeleter:                      false,
 		DefaultBaseImageRegistryWhiteList: []string{"some-registry"},
 		WorkspaceImage:                    "some-workspace-image",
 		JWTSecret:                         "some-jwt-secret",
@@ -53,6 +55,7 @@ func TestConfigMap(t *testing.T) {
 				Server: &experimental.ServerConfig{
 					DisableDynamicAuthProviderLogin:   expectation.DisableDynamicAuthProviderLogin,
 					EnableLocalApp:                    expectation.EnableLocalApp,
+					RunDbDeleter:                      expectation.RunDbDeleter,
 					DefaultBaseImageRegistryWhiteList: expectation.DefaultBaseImageRegistryWhiteList,
 					WorkspaceDefaults: experimental.WorkspaceDefaults{
 						WorkspaceImage: expectation.WorkspaceImage,
@@ -94,6 +97,7 @@ func TestConfigMap(t *testing.T) {
 	actual := Expectation{
 		DisableDynamicAuthProviderLogin:   config.DisableDynamicAuthProviderLogin,
 		EnableLocalApp:                    config.EnableLocalApp,
+		RunDbDeleter:                      config.RunDbDeleter,
 		DefaultBaseImageRegistryWhiteList: config.DefaultBaseImageRegistryWhitelist,
 		WorkspaceImage:                    config.WorkspaceDefaults.WorkspaceImage,
 		JWTSecret:                         config.OAuthServer.JWTSecret,

diff --git a/install/installer/pkg/config/v1/experimental/experimental.go b/install/installer/pkg/config/v1/experimental/experimental.go
@@ -128,6 +128,7 @@ type ServerConfig struct {
 	ChargebeeSecret                   string            `json:"chargebeeSecret"`
 	DisableDynamicAuthProviderLogin   bool              `json:"disableDynamicAuthProviderLogin"`
 	EnableLocalApp                    bool              `json:"enableLocalApp"`
+	RunDbDeleter                      bool              `json:"runDbDeleter"`
 	DefaultBaseImageRegistryWhiteList []string          `json:"defaultBaseImageRegistryWhitelist"`
 }