Skip to content

Commit 2206054

Browse files
committed
OCPBUGS-54695:Empty proxy variables are causing issues during the build
Problem: Irrespective of default proxy settings these proxy variables are set on build containers. If any defaults are set they reflect those setting ,if not set they are set to null on the build container. Having these null variables are causing problems to some customers as its breaking some required apps on container HTTP_PROXY,http_proxy,HTTPS_PROXY,https_proxy,NO_PROXY,no_proxy Fix: Code changed only to add these proxy variables only if they are defined in defaults and if they are not null.
1 parent 49eb6f8 commit 2206054

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

pkg/build/controller/build/defaults/defaults.go

+13-7
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (b BuildDefaults) ApplyDefaults(pod *corev1.Pod) error {
2727
return nil
2828
}
2929

30-
if b.DefaultProxy != nil {
30+
if b.DefaultProxy.HTTPProxy != "" || b.DefaultProxy.HTTPSProxy != "" || b.DefaultProxy.NoProxy != "" {
3131
b.applyPodProxyDefaults(pod, build.Spec.Strategy.CustomStrategy != nil)
3232
}
3333

@@ -95,12 +95,18 @@ func (b BuildDefaults) applyPodProxyDefaults(pod *corev1.Pod, isCustomBuild bool
9595
// All env vars are allowed to be set in a custom build pod, the user already has
9696
// total control over the env+logic in a custom build pod anyway.
9797
externalEnv := []corev1.EnvVar{}
98-
externalEnv = append(externalEnv, corev1.EnvVar{Name: "HTTP_PROXY", Value: b.DefaultProxy.HTTPProxy})
99-
externalEnv = append(externalEnv, corev1.EnvVar{Name: "http_proxy", Value: b.DefaultProxy.HTTPProxy})
100-
externalEnv = append(externalEnv, corev1.EnvVar{Name: "HTTPS_PROXY", Value: b.DefaultProxy.HTTPSProxy})
101-
externalEnv = append(externalEnv, corev1.EnvVar{Name: "https_proxy", Value: b.DefaultProxy.HTTPSProxy})
102-
externalEnv = append(externalEnv, corev1.EnvVar{Name: "NO_PROXY", Value: b.DefaultProxy.NoProxy})
103-
externalEnv = append(externalEnv, corev1.EnvVar{Name: "no_proxy", Value: b.DefaultProxy.NoProxy})
98+
if b.DefaultProxy.HTTPProxy != "" {
99+
externalEnv = append(externalEnv, corev1.EnvVar{Name: "HTTP_PROXY", Value: b.DefaultProxy.HTTPProxy})
100+
externalEnv = append(externalEnv, corev1.EnvVar{Name: "http_proxy", Value: b.DefaultProxy.HTTPProxy})
101+
}
102+
if b.DefaultProxy.HTTPSProxy != "" {
103+
externalEnv = append(externalEnv, corev1.EnvVar{Name: "HTTPS_PROXY", Value: b.DefaultProxy.HTTPSProxy})
104+
externalEnv = append(externalEnv, corev1.EnvVar{Name: "https_proxy", Value: b.DefaultProxy.HTTPSProxy})
105+
}
106+
if b.DefaultProxy.NoProxy != "" {
107+
externalEnv = append(externalEnv, corev1.EnvVar{Name: "NO_PROXY", Value: b.DefaultProxy.NoProxy})
108+
externalEnv = append(externalEnv, corev1.EnvVar{Name: "no_proxy", Value: b.DefaultProxy.NoProxy})
109+
}
104110

105111
if isCustomBuild {
106112
buildutil.MergeEnvWithoutDuplicates(externalEnv, &c.Env, false, []string{})

0 commit comments

Comments
 (0)