github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +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

3
pkg/kubelet/kubelet.go
View File

@@ -74,6 +74,7 @@ import (
utilerrors "k8s.io/kubernetes/pkg/util/errors"
kubeio "k8s.io/kubernetes/pkg/util/io"
"k8s.io/kubernetes/pkg/util/mount"
utilnet "k8s.io/kubernetes/pkg/util/net"
nodeutil "k8s.io/kubernetes/pkg/util/node"
"k8s.io/kubernetes/pkg/util/oom"
"k8s.io/kubernetes/pkg/util/procfs"
@@ -2713,7 +2714,7 @@ func (kl *Kubelet) setNodeAddress(node *api.Node) error {
}
if len(node.Status.Addresses) == 0 {
ip, err := util.ChooseHostInterface()
ip, err := utilnet.ChooseHostInterface()
if err != nil {
return err
}