github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 17:38:50 +00:00
Code Issues Projects Releases Wiki Activity

support CIDRs in NO_PROXY

Browse Source
This commit is contained in:
deads2k
2016-03-15 15:29:08 -04:00
parent eb0e25f5bd
commit ab03317d96
15 changed files with 176 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/kubectl.go
View File

@@ -45,6 +45,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/labels"
utilnet "k8s.io/kubernetes/pkg/util/net"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/pkg/version"
@@ -1203,9 +1204,9 @@ func curlUnix(url string, path string) (string, error) {
dial := func(proto, addr string) (net.Conn, error) {
return net.Dial("unix", path)
}
transport := &http.Transport{
transport := utilnet.SetTransportDefaults(&http.Transport{
Dial: dial,
}
})
return curlTransport(url, transport)
}
@@ -1224,7 +1225,7 @@ func curlTransport(url string, transport *http.Transport) (string, error) {
}
func curl(url string) (string, error) {
return curlTransport(url, &http.Transport{})
return curlTransport(url, utilnet.SetTransportDefaults(&http.Transport{}))
}
func validateGuestbookApp(c *client.Client, ns string) {