Skip to content

[installer] Actually add 'inactivityPeriodForReposInDays' to server configmap #14177

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.

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 4 commits into from
Oct 26, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
5 changes: 3 additions & 2 deletions install/installer/cmd/testdata/render/aws-setup/output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions install/installer/cmd/testdata/render/gcp-setup/output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions install/installer/cmd/testdata/render/minimal/output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions install/installer/cmd/testdata/render/shortname/output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion install/installer/pkg/components/server/configmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,14 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
return nil
})

inactivityPeriodForRepos := 0
_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
if cfg.WebApp != nil && cfg.WebApp.Server != nil && cfg.WebApp.Server.InactivityPeriodForRepos != nil {
inactivityPeriodForRepos = *cfg.WebApp.Server.InactivityPeriodForRepos
}
return nil
})

// todo(sje): all these values are configurable
scfg := ConfigSerialized{
Version: ctx.VersionManifest.Version,
Expand Down Expand Up @@ -263,7 +271,8 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
// default limit for all cloneURLs
"*": 50,
},
WorkspaceClasses: workspaceClasses,
WorkspaceClasses: workspaceClasses,
InactivityPeriodForRepos: inactivityPeriodForRepos,
}

fc, err := common.ToJSONString(scfg)
Expand Down
5 changes: 3 additions & 2 deletions install/installer/pkg/components/server/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
InactivityPeriodForRepos int `json:"inactivityPeriodForRepos"`
}
type CodeSyncResources struct {
RevLimit int32 `json:"revLimit"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ type ServerConfig struct {
EnableLocalApp *bool `json:"enableLocalApp"`
RunDbDeleter *bool `json:"runDbDeleter"`
DisableWorkspaceGarbageCollection bool `json:"disableWorkspaceGarbageCollection"`
InactivityPeriodForRepos *int `json:"inactivityPeriodForRepos"`

// @deprecated use containerRegistry.privateBaseImageAllowList instead
DefaultBaseImageRegistryWhiteList []string `json:"defaultBaseImageRegistryWhitelist"`
Expand Down