Merge pull request #434 from galal-hussein/add_no_proxy

Add no_proxy env to server
k3s-io · May 3, 2019 · b0e4228 · b0e4228
2 parents 52f845e + f7376ad
commit b0e4228
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/pkg/helm/controller.go b/pkg/helm/controller.go
@@ -321,10 +321,13 @@ func keys(val map[string]intstr.IntOrString) []string {
 
 func setProxyEnv(job *batch.Job) {
 	proxySysEnv := []string{
+		"all_proxy",
+		"ALL_PROXY",
 		"http_proxy",
-		"https_proxy",
 		"HTTP_PROXY",
+		"https_proxy",
 		"HTTPS_PROXY",
+		"no_proxy",
 		"NO_PROXY",
 	}
 	for _, proxyEnv := range proxySysEnv {

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/pkg/errors"
@@ -48,6 +49,10 @@ func StartServer(ctx context.Context, config *Config) (string, error) {
 		return "", err
 	}
 
+	if err := setNoProxyEnv(&config.ControlConfig); err != nil {
+		return "", err
+	}
+
 	if err := control.Server(ctx, &config.ControlConfig); err != nil {
 		return "", errors.Wrap(err, "starting kubernetes")
 	}
@@ -293,3 +298,12 @@ func writeToken(token, file, certs string) error {
 	token = FormatToken(token, certs)
 	return ioutil.WriteFile(file, []byte(token+"\n"), 0600)
 }
+
+func setNoProxyEnv(config *config.Control) error {
+	envList := strings.Join([]string{
+		os.Getenv("NO_PROXY"),
+		config.ClusterIPRange.String(),
+		config.ServiceIPRange.String(),
+	}, ",")
+	return os.Setenv("NO_PROXY", envList)
+}