From c52bdc8e74c071cbd23796400190784a24010237 Mon Sep 17 00:00:00 2001
From: Dong Liu <doliu@microsoft.com>
Date: Thu, 10 Aug 2017 10:35:56 +0800
Subject: [PATCH] Fix AnnotationProvidedIPAddr for externalCloudProvider

---
 pkg/kubelet/kubelet_node_status.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go
index 314cc031940..c098803abf1 100644
--- a/pkg/kubelet/kubelet_node_status.go
+++ b/pkg/kubelet/kubelet_node_status.go
@@ -424,6 +424,9 @@ func (kl *Kubelet) setNodeAddress(node *v1.Node) error {
 	}
 
 	if kl.externalCloudProvider {
+		if kl.nodeIP != nil {
+			node.ObjectMeta.Annotations[kubeletapis.AnnotationProvidedIPAddr] = kl.nodeIP.String()
+		}
 		// We rely on the external cloud provider to supply the addresses.
 		return nil
 	}
@@ -479,7 +482,6 @@ func (kl *Kubelet) setNodeAddress(node *v1.Node) error {
 		// 4) Try to get the IP from the network interface used as default gateway
 		if kl.nodeIP != nil {
 			ipAddr = kl.nodeIP
-			node.ObjectMeta.Annotations[kubeletapis.AnnotationProvidedIPAddr] = kl.nodeIP.String()
 		} else if addr := net.ParseIP(kl.hostname); addr != nil {
 			ipAddr = addr
 		} else {