github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-28 21:55:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19334 from resouer/network

Browse Source 
Networking should be used to hold network related pkgs
This commit is contained in:
Alex Mohr
2016-01-21 10:26:13 -08:00
parent 8c9aa2af33 936a11e775
commit d2d349bc84
43 changed files with 687 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/client/kubelet_client.go
View File

@@ -27,7 +27,7 @@ import (
"k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/client/transport"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/util"
utilnet "k8s.io/kubernetes/pkg/util/net"
)
type KubeletClientConfig struct {
@@ -71,7 +71,7 @@ func MakeTransport(config *KubeletClientConfig) (http.RoundTripper, error) {
rt := http.DefaultTransport
if config.Dial != nil || tlsConfig != nil {
rt = util.SetTransportDefaults(&http.Transport{
rt = utilnet.SetTransportDefaults(&http.Transport{
Dial: config.Dial,
TLSClientConfig: tlsConfig,
})