Proxy: handle lower case proxy env vars

kubernetes · Jun 26, 2019 · 886d159 · 886d159
1 parent 904bc49
commit 886d159
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -468,6 +468,9 @@ func generateConfig(cmd *cobra.Command, k8sVersion string) (cfg.Config, error) {
 		if !cmd.Flags().Changed("docker-env") {
 			for _, k := range proxy.EnvVars {
 				if v := os.Getenv(k); v != "" {
+					// convert https_proxy to HTTPS_PROXY for linux
+					// TODO (@medyagh): if user has both http_proxy & HTTPS_PROXY set merge them.
+					k = strings.ToUpper(k)
 					dockerEnv = append(dockerEnv, fmt.Sprintf("%s=%s", k, v))
 				}
 			}
@@ -625,6 +628,7 @@ func validateNetwork(h *host.Host) string {
 			}
 			console.OutStyle(console.Option, "%s=%s", k, v)
 			ipExcluded := proxy.IsIPExcluded(ip) // Skip warning if minikube ip is already in NO_PROXY
+			k = strings.ToUpper(k)               // for http_proxy & https_proxy
 			if (k == "HTTP_PROXY" || k == "HTTPS_PROXY") && !ipExcluded && !warnedOnce {
 				console.Warning("You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP (%s). Please see https://github.com/kubernetes/minikube/blob/master/docs/http_proxy.md for more details", ip)
 				warnedOnce = true

diff --git a/pkg/minikube/proxy/proxy.go b/pkg/minikube/proxy/proxy.go
@@ -29,7 +29,7 @@ import (
 )
 
 // EnvVars are variables we plumb through to the underlying container runtime
-var EnvVars = []string{"HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY"}
+var EnvVars = []string{"HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY", "http_proxy", "https_proxy", "no_proxy"}
 
 // isInBlock checks if ip is a CIDR block
 func isInBlock(ip string, block string) (bool, error) {