[installer] enable protected_secrets by default

gitpod-io · Oct 7, 2022 · 9b71206 · 9b71206
1 parent e564cb4
commit 9b71206
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 31 deletions.
diff --git a/install/installer/cmd/testdata/render/aws-setup/config.yaml b/install/installer/cmd/testdata/render/aws-setup/config.yaml
@@ -28,3 +28,6 @@ objectStorage:
     credentials:
       kind: secret
       name: aws-storage
+experimental:
+  workspace:
+    enableProtectedSecrets: true
diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden
diff --git a/install/installer/cmd/testdata/render/azure-setup/config.yaml b/install/installer/cmd/testdata/render/azure-setup/config.yaml
@@ -24,3 +24,6 @@ objectStorage:
     credentials:
       kind: secret
       name: azure-storage
+experimental:
+  workspace:
+    enableProtectedSecrets: true
diff --git a/install/installer/cmd/testdata/render/azure-setup/output.golden b/install/installer/cmd/testdata/render/azure-setup/output.golden
diff --git a/install/installer/cmd/testdata/render/gcp-setup/config.yaml b/install/installer/cmd/testdata/render/gcp-setup/config.yaml
@@ -26,3 +26,6 @@ objectStorage:
     serviceAccount:
       kind: secret
       name: gcp-storage
+experimental:
+  workspace:
+    enableProtectedSecrets: true
diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden
diff --git a/install/installer/cmd/testdata/render/insecure-s3-setup/config.yaml b/install/installer/cmd/testdata/render/insecure-s3-setup/config.yaml
@@ -14,3 +14,6 @@ objectStorage:
     credentials:
       kind: secret
       name: s3-storage
+experimental:
+  workspace:
+    enableProtectedSecrets: true
diff --git a/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden b/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden
diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden
diff --git a/install/installer/pkg/components/server/configmap.go b/install/installer/pkg/components/server/configmap.go
@@ -165,7 +165,9 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 
 	defaultFeatureFlags := []NamedWorkspaceFeatureFlag{}
 	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
-		if cfg.Workspace != nil && cfg.Workspace.EnableProtectedSecrets {
+		if cfg == nil || cfg.Workspace == nil {
+			defaultFeatureFlags = append(defaultFeatureFlags, NamedWorkspaceFeatureProtectedSecrets)
+		} else if cfg.Workspace != nil && cfg.Workspace.EnableProtectedSecrets {
 			defaultFeatureFlags = append(defaultFeatureFlags, NamedWorkspaceFeatureProtectedSecrets)
 		}
 		return nil