Browse Source

Use no_proxy env, add .svc and cluster domains

pull/2377/head
Erik Wilson 4 years ago
parent
commit
56e077eb29
No known key found for this signature in database
GPG Key ID: 28E43BB8BE202CF8
  1. 16
      pkg/server/server.go

16
pkg/server/server.go

@ -387,12 +387,20 @@ func writeToken(token, file, certs string) error {
}
func setNoProxyEnv(config *config.Control) error {
envList := strings.Join([]string{
os.Getenv("NO_PROXY"),
splitter := func(c rune) bool {
return c == ','
}
envList := []string{}
envList = append(envList, strings.FieldsFunc(os.Getenv("NO_PROXY"), splitter)...)
envList = append(envList, strings.FieldsFunc(os.Getenv("no_proxy"), splitter)...)
envList = append(envList,
".svc",
"."+config.ClusterDomain,
config.ClusterIPRange.String(),
config.ServiceIPRange.String(),
}, ",")
return os.Setenv("NO_PROXY", envList)
)
os.Unsetenv("no_proxy")
return os.Setenv("NO_PROXY", strings.Join(envList, ","))
}
func writeConfigSymlink(kubeconfig, kubeconfigSymlink string) error {

Loading…
Cancel
Save