From 4b86b1eba655cf97d4c63de0fa51d63ab0ae7454 Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Thu, 10 Aug 2023 14:47:05 -0400 Subject: [PATCH] Set lowercase version of proxy env vars in addition to uppercase To hopefully ensure all tools respect proxy settings for a workspace, add both upper- and lower-case versions of the proxy environment variables to workspaces. For example, curl will only use the lower-case http_proxy, and will ignore HTTP_PROXY. Signed-off-by: Angel Misevski --- controllers/usernamespace/controller.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controllers/usernamespace/controller.go b/controllers/usernamespace/controller.go index 1af7c158a..e032e9040 100644 --- a/controllers/usernamespace/controller.go +++ b/controllers/usernamespace/controller.go @@ -405,12 +405,15 @@ func (r *CheUserNamespaceReconciler) reconcileProxySettings(ctx context.Context, proxySettings := map[string]string{} if proxyConfig.HttpProxy != "" { proxySettings["HTTP_PROXY"] = proxyConfig.HttpProxy + proxySettings["http_proxy"] = proxyConfig.HttpProxy } if proxyConfig.HttpsProxy != "" { proxySettings["HTTPS_PROXY"] = proxyConfig.HttpsProxy + proxySettings["https_proxy"] = proxyConfig.HttpsProxy } if proxyConfig.NoProxy != "" { proxySettings["NO_PROXY"] = proxyConfig.NoProxy + proxySettings["no_proxy"] = proxyConfig.NoProxy } key := client.ObjectKey{Name: prefixedName("proxy-settings"), Namespace: targetNs}