Skip to content

Commit d889fe9

Browse files
kylos101jenting
authored andcommitted
[installer] enable protected_secrets by default
Signed-off-by: JenTing Hsiao <[email protected]>
1 parent e564cb4 commit d889fe9

File tree

13 files changed

+53
-26
lines changed

13 files changed

+53
-26
lines changed

install/installer/cmd/testdata/render/aws-setup/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/azure-setup/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/customization/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/external-registry/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/gcp-setup/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/http-proxy/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/insecure-s3-setup/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/minimal/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/statefulset-customization/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/use-pod-security-policies/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/workspace-requests-limits/output.golden

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,15 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
163163
return nil
164164
})
165165

166-
defaultFeatureFlags := []NamedWorkspaceFeatureFlag{}
166+
// Enable protected_secrets by default
167+
defaultFeatureFlags := []NamedWorkspaceFeatureFlag{NamedWorkspaceFeatureProtectedSecrets}
167168
_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
168-
if cfg.Workspace != nil && cfg.Workspace.EnableProtectedSecrets {
169-
defaultFeatureFlags = append(defaultFeatureFlags, NamedWorkspaceFeatureProtectedSecrets)
169+
if cfg == nil || cfg.Workspace == nil || cfg.Workspace.EnableProtectedSecrets == nil {
170+
return nil
171+
}
172+
if !*cfg.Workspace.EnableProtectedSecrets {
173+
// Disable protected_secrets if it explicitly set to false in the installer configuration
174+
defaultFeatureFlags = []NamedWorkspaceFeatureFlag{}
170175
}
171176
return nil
172177
})

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ type WorkspaceConfig struct {
120120
UsageReportBucketName string `json:"usageReportBucketName"`
121121
} `json:"contentService"`
122122

123-
EnableProtectedSecrets bool `json:"enableProtectedSecrets"`
123+
EnableProtectedSecrets *bool `json:"enableProtectedSecrets"`
124124
}
125125

126126
type PersistentVolumeClaim struct {

0 commit comments

Comments
 (0)