Skip to content

[installer] Support enabling protected secrets #13484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2022
Merged

[installer] Support enabling protected secrets #13484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion install/installer/pkg/components/server/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,14 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
return nil
})

defaultFeatureFlags := []NamedWorkspaceFeatureFlag{}
_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
if cfg.Workspace != nil && cfg.Workspace.EnableProtectedSecrets {
defaultFeatureFlags = append(defaultFeatureFlags, NamedWorkspaceFeatureProtectedSecrets)
}
return nil
})

// todo(sje): all these values are configurable
scfg := ConfigSerialized{
Version: ctx.VersionManifest.Version,
Expand All @@ -176,7 +184,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
WorkspaceDefaults: WorkspaceDefaults{
WorkspaceImage: workspaceImage,
PreviewFeatureFlags: []NamedWorkspaceFeatureFlag{},
DefaultFeatureFlags: []NamedWorkspaceFeatureFlag{},
DefaultFeatureFlags: defaultFeatureFlags,
TimeoutDefault: ctx.Config.Workspace.TimeoutDefault,
TimeoutExtended: ctx.Config.Workspace.TimeoutExtended,
},
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/server/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ type NamedWorkspaceFeatureFlag string

const (
NamedWorkspaceFeatureFlagFullWorkspaceBackup NamedWorkspaceFeatureFlag = "full_workspace_backup"
NamedWorkspaceFeatureProtectedSecrets NamedWorkspaceFeatureFlag = "protected_secrets"
)

type WorkspaceClassCategory string
Expand Down
2 changes: 2 additions & 0 deletions install/installer/pkg/config/v1/experimental/experimental.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ type WorkspaceConfig struct {
// Deprecated
UsageReportBucketName string `json:"usageReportBucketName"`
} `json:"contentService"`

EnableProtectedSecrets bool `json:"enableProtectedSecrets"`
}

type PersistentVolumeClaim struct {
Expand Down