diff --git a/install/installer/pkg/common/ca.go b/install/installer/pkg/common/ca.go index ab306c4e10f47e..0d8a938b18f0c6 100644 --- a/install/installer/pkg/common/ca.go +++ b/install/installer/pkg/common/ca.go @@ -47,6 +47,7 @@ func InternalCAContainer(ctx *RenderContext, mod ...func(*corev1.Container)) *co MountPath: "/usr/local/share/ca-certificates/gitpod-ca.crt", }, }, + Env: ProxyEnv(&ctx.Config), } for _, m := range mod { @@ -87,11 +88,14 @@ func CustomCACertVolume(ctx *RenderContext) (vol *corev1.Volume, mnt *corev1.Vol MountPath: customCAMountPath, SubPath: "ca.crt", } - env = []corev1.EnvVar{ - {Name: "NODE_EXTRA_CA_CERTS", Value: customCAMountPath}, - {Name: "GIT_SSL_CAPATH", Value: certsMountPath}, - {Name: "GIT_SSL_CAINFO", Value: customCAMountPath}, - } + env = MergeEnv( + []corev1.EnvVar{ + {Name: "NODE_EXTRA_CA_CERTS", Value: customCAMountPath}, + {Name: "GIT_SSL_CAPATH", Value: certsMountPath}, + {Name: "GIT_SSL_CAINFO", Value: customCAMountPath}, + }, + ProxyEnv(&ctx.Config), + ) ok = true return } diff --git a/install/installer/pkg/components/ws-daemon/daemonset.go b/install/installer/pkg/components/ws-daemon/daemonset.go index e4abd61e69a62f..ccbf48362ffa66 100644 --- a/install/installer/pkg/components/ws-daemon/daemonset.go +++ b/install/installer/pkg/components/ws-daemon/daemonset.go @@ -58,6 +58,7 @@ fi Privileged: pointer.Bool(true), ProcMount: func() *corev1.ProcMountType { r := corev1.DefaultProcMount; return &r }(), }, + Env: common.ProxyEnv(&cfg), }, { Name: "seccomp-profile-installer", @@ -72,6 +73,7 @@ fi MountPath: "/mnt/dst", }}, SecurityContext: &corev1.SecurityContext{Privileged: pointer.Bool(true)}, + Env: common.ProxyEnv(&cfg), }, { Name: "sysctl", @@ -91,6 +93,7 @@ fi `, }, SecurityContext: &corev1.SecurityContext{Privileged: pointer.Bool(true)}, + Env: common.ProxyEnv(&cfg), }, } @@ -104,6 +107,7 @@ fi MountPath: "/usr/src_node", }}, SecurityContext: &corev1.SecurityContext{Privileged: pointer.Bool(true)}, + Env: common.ProxyEnv(&cfg), }) } @@ -294,6 +298,7 @@ fi }, Env: common.CustomizeEnvvar(ctx, Component, common.MergeEnv( common.NodeNameEnv(ctx), + common.ProxyEnv(&cfg), )), ImagePullPolicy: corev1.PullIfNotPresent, Lifecycle: &corev1.Lifecycle{