Skip to content

[openvsx-proxy] Pass in proxy settings as env vars #19364

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
roboquat merged 2 commits into from
Jan 30, 2024
Merged

[openvsx-proxy] Pass in proxy settings as env vars #19364

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4f2166
[openvsx-proxy] Pass in proxy settings as env vars
nandajavarma Jan 30, 2024
f6375cc
remove unnecessary env var
nandajavarma Jan 30, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions install/installer/pkg/components/openvsx-proxy/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,29 @@ func statefulset(ctx *common.RenderContext) ([]runtime.Object, error) {

const redisContainerName = "redis"

var proxyEnvVars []v1.EnvVar
if ctx.Config.Experimental != nil && ctx.Config.Experimental.WebApp != nil {
proxyConfig := ctx.Config.Experimental.WebApp.ProxySettings
if proxyConfig != nil {
proxyEnvVars = []v1.EnvVar{
{
Name: "HTTP_PROXY",
Value: proxyConfig.HttpProxy,
},
{
Name: "HTTPS_PROXY",
Value: proxyConfig.HttpsProxy,
},
{
Name: "NO_PROXY",
Value: proxyConfig.HttpsProxy,
},
}

}

}

return []runtime.Object{&appsv1.StatefulSet{
TypeMeta: common.TypeMetaStatefulSet,
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -136,6 +159,7 @@ func statefulset(ctx *common.RenderContext) ([]runtime.Object, error) {
Env: common.CustomizeEnvvar(ctx, Component, common.MergeEnv(
common.DefaultEnv(&ctx.Config),
common.ConfigcatEnv(ctx),
proxyEnvVars,
)),
}, {
Name: redisContainerName,
Expand Down
10 changes: 10 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 @@ -209,6 +209,15 @@ type WebAppConfig struct {
SpiceDB *SpiceDBConfig `json:"spicedb,omitempty"`
CertmanagerNamespaceOverride string `json:"certmanagerNamespaceOverride,omitempty"`
Redis *RedisConfig `json:"redis"`

// ProxySettings is used if the gitpod cell uses some proxy for connectivity
ProxySettings *ProxySettings `json:"proxySettings"`
}

type ProxySettings struct {
HttpProxy string `json:"http_proxy"`
HttpsProxy string `json:"https_proxy"`
NoProxy string `json:"no_proxy"`
}

type WorkspaceDefaults struct {
Expand Down Expand Up @@ -342,6 +351,7 @@ type IDEMetricsConfig struct {
// @deprecated
type VSXProxyConfig struct {
ServiceAnnotations map[string]string `json:"serviceAnnotations"`
ExtraEnvVars map[string]string `json:"extraEnvVars"`
}

type TracingSampleType string
Expand Down