From 46465c0a5a5d19dc1ec6e2f6ef2b86e59cb87502 Mon Sep 17 00:00:00 2001 From: ublubu Date: Wed, 7 Jun 2017 22:27:18 -0400 Subject: [PATCH] Kubelet doesn't override addrs from Cloud provider --- pkg/kubelet/kubelet_node_status.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index eb87122093..5343f95111 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -420,7 +420,10 @@ func (kl *Kubelet) setNodeAddress(node *v1.Node) error { 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() if !ok { return fmt.Errorf("failed to get instances from cloud provider")