Skip to content

installer: make OpenVSX URL configurable in the openvsx proxy #8266

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
Feb 22, 2022
Merged

installer: make OpenVSX URL configurable in the openvsx proxy #8266

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
2 changes: 1 addition & 1 deletion install/installer/pkg/components/openvsx-proxy/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
LogDebug: false,
CacheDurationRegular: util.Duration(time.Minute),
CacheDurationBackup: util.Duration(time.Hour * 72),
URLUpstream: "https://open-vsx.org", // todo(sje): make configurable
URLUpstream: ctx.Config.OpenVSX.URL,
URLLocal: fmt.Sprintf("https://open-vsx.%s", ctx.Config.Domain),
MaxIdleConns: 1000,
MaxIdleConnsPerHost: 1000,
Expand Down
7 changes: 7 additions & 0 deletions install/installer/pkg/config/v1/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func (v version) Defaults(in interface{}) error {
cfg.Workspace.Runtime.FSShiftMethod = FSShiftFuseFS
cfg.Workspace.Runtime.ContainerDSocket = "/run/containerd/containerd.sock"
cfg.Workspace.Runtime.ContainerDRuntimeDir = "/var/lib/containerd/io.containerd.runtime.v2.task/k8s.io"
cfg.OpenVSX.URL = "https://open-vsx.org"

return nil
}
Expand Down Expand Up @@ -82,6 +83,8 @@ type Config struct {

Workspace Workspace `json:"workspace" validate:"required"`

OpenVSX OpenVSX `json:"openVSX"`

AuthProviders []ObjectRef `json:"authProviders" validate:"dive"`
BlockNewUsers BlockNewUsers `json:"blockNewUsers"`
License *ObjectRef `json:"license,omitempty"`
Expand Down Expand Up @@ -229,6 +232,10 @@ type Workspace struct {
Templates *WorkspaceTemplates `json:"templates,omitempty"`
}

type OpenVSX struct {
URL string `json:"url" validate:"url"`
}

type FSShiftMethod string

const (
Expand Down
3 changes: 3 additions & 0 deletions install/installer/pkg/config/v1/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ func LoadMock() *Config {
Kind: ObjectRefSecret,
Name: "https-certs",
},
OpenVSX: OpenVSX{
URL: "https://open-vsx.org",
},
Workspace: Workspace{
Runtime: WorkspaceRuntime{
FSShiftMethod: FSShiftFuseFS,
Expand Down