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

Kubelet doesn't override addrs from Cloud provider

Browse Source
This commit is contained in:
ublubu 2017-06-07 22:27:18 -04:00
parent 3837d95191
commit 46465c0a5a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/kubelet_node_status.go
View File

@ -420,7 +420,10 @@ func (kl *Kubelet) setNodeAddress(node *v1.Node) error {
glog.V(2).Infof("Using node IP: %q", kl.nodeIP.String()) glog.V(2).Infof("Using node IP: %q", kl.nodeIP.String())
} }
if kl.cloud != nil { if kl.externalCloudProvider {
// We rely on the external cloud provider to supply the addresses.
return nil
} else if kl.cloud != nil {
instances, ok := kl.cloud.Instances() instances, ok := kl.cloud.Instances()
if !ok { if !ok {
return fmt.Errorf("failed to get instances from cloud provider") return fmt.Errorf("failed to get instances from cloud provider")