From 6df2139d5a0882bc95e0bfafc4af789774878b0c Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Fri, 18 Sep 2015 17:44:24 -0700
Subject: [PATCH] Revert "Update node status even if cloudprovider API dies"

---
 pkg/kubelet/node_manager.go | 117 +++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 62 deletions(-)

diff --git a/pkg/kubelet/node_manager.go b/pkg/kubelet/node_manager.go
index 13bad861ec2..773672b179e 100644
--- a/pkg/kubelet/node_manager.go
+++ b/pkg/kubelet/node_manager.go
@@ -297,73 +297,66 @@ func (nm *realNodeManager) registerWithApiserver() {
 	}
 }
 
-func (nm *realNodeManager) setUpdatedAddressesFromCloud(node *api.Node) {
-	instances, ok := nm.cloud.Instances()
-	if !ok {
-		glog.Errorf("Failed to get instances from cloud provider, so node addresses will be stale")
-		return
-	}
-	// TODO(roberthbailey): Can we do this without having credentials to talk to the cloud provider?
-	// TODO(justinsb): We can if CurrentNodeName() was actually CurrentNode() and returned an interface
-	nodeAddresses, err := instances.NodeAddresses(nm.nodeName)
-	if err != nil {
-		glog.Errorf("Failed to get addresses from cloud provider, so node addresses will be stale: %v", err)
-		return
-	}
-	node.Status.Addresses = nodeAddresses
-}
-
-func (nm *realNodeManager) setUpdatedAddressesFromHostname(node *api.Node) {
-	addr := net.ParseIP(nm.hostname)
-	if addr == nil {
-		addrs, err := net.LookupIP(node.Name)
-
-		if err != nil {
-			glog.Errorf("Can't get ip address of node %s, so node addresses will be stale: %v", node.Name, err)
-			return
-		}
-
-		if len(addrs) == 0 {
-			glog.Errorf("No ip address for node %v, so node addresses will be stale", node.Name)
-			return
-		}
-
-		// check all ip addresses for this node.Name and try to find the first non-loopback IPv4 address.
-		// If no match is found, it uses the IP of the interface with gateway on it.
-		for _, ip := range addrs {
-			if !ip.IsLoopback() && ip.To4() != nil {
-				addr = ip
-				break
-			}
-		}
-
-		if addr == nil {
-			ip, err := util.ChooseHostInterface()
-			if err != nil {
-				glog.Errorf("Failed choosing host interface, so node addresses will be stale: %v", err)
-				return
-			}
-			addr = ip
-		}
-	}
-
-	node.Status.Addresses = []api.NodeAddress{
-		{Type: api.NodeLegacyHostIP, Address: addr.String()},
-		{Type: api.NodeInternalIP, Address: addr.String()},
-	}
-}
-
 // setNodeStatus fills in the Status fields of the given Node, overwriting
 // any fields that are currently set.
 func (nm *realNodeManager) setNodeStatus(node *api.Node) error {
-
-	// Set addresses for the node. These addresses may be stale if there is an
-	// error retrieving an updated value, such as the cloudprovider API being
-	// unavailable.
+	// Set addresses for the node.
 	if nm.cloud != nil {
-		nm.setUpdatedAddressesFromCloud(node)
+		instances, ok := nm.cloud.Instances()
+		if !ok {
+			return fmt.Errorf("failed to get instances from cloud provider")
+		}
+		// TODO(roberthbailey): Can we do this without having credentials to talk
+		// to the cloud provider?
+		// TODO(justinsb): We can if CurrentNodeName() was actually CurrentNode() and returned an interface
+		nodeAddresses, err := instances.NodeAddresses(nm.nodeName)
+		if err != nil {
+			return fmt.Errorf("failed to get node address from cloud provider: %v", err)
+		}
+		node.Status.Addresses = nodeAddresses
 	} else {
-		nm.setUpdatedAddressesFromHostname(node)
+		addr := net.ParseIP(nm.hostname)
+		if addr != nil {
+			node.Status.Addresses = []api.NodeAddress{
+				{Type: api.NodeLegacyHostIP, Address: addr.String()},
+				{Type: api.NodeInternalIP, Address: addr.String()},
+			}
+		} else {
+			addrs, err := net.LookupIP(node.Name)
+			if err != nil {
+				return fmt.Errorf("can't get ip address of node %s: %v", node.Name, err)
+			} else if len(addrs) == 0 {
+				return fmt.Errorf("no ip address for node %v", node.Name)
+			} else {
+				// check all ip addresses for this node.Name and try to find the first non-loopback IPv4 address.
+				// If no match is found, it uses the IP of the interface with gateway on it.
+				for _, ip := range addrs {
+					if ip.IsLoopback() {
+						continue
+					}
+
+					if ip.To4() != nil {
+						node.Status.Addresses = []api.NodeAddress{
+							{Type: api.NodeLegacyHostIP, Address: ip.String()},
+							{Type: api.NodeInternalIP, Address: ip.String()},
+						}
+						break
+					}
+				}
+
+				if len(node.Status.Addresses) == 0 {
+					ip, err := util.ChooseHostInterface()
+					if err != nil {
+						return err
+					}
+
+					node.Status.Addresses = []api.NodeAddress{
+						{Type: api.NodeLegacyHostIP, Address: ip.String()},
+						{Type: api.NodeInternalIP, Address: ip.String()},
+					}
+				}
+			}
+		}
 	}
 
 	// TODO: Post NotReady if we cannot get MachineInfo from cAdvisor. This needs to start