Fix AWS kubelet registration.

This commit allows the AWS cloud provider plugin to work on EC2 instances that do not have a public IP. The EC2 metadata service returns a 404 for the 'public-ipv4' endpoint for private instances, and the plugin was bubbling this up as a fatal error.

Fix AWS kubelet registration.
adde7f54 · David Pratt · 9942f6bf · adde7f54
Commit adde7f54 authored Jan 21, 2016 by David Pratt
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

aws.go pkg/cloudprovider/providers/aws/aws.go +10 -6

No files found.
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -650,19 +650,23 @@ func (aws *AWSCloud) NodeAddresses(name string) ([]api.NodeAddress, error) {
 		return nil, err
 	}
 	if self.nodeName == name || len(name) == 0 {
+		addresses := []api.NodeAddress{}
+
 		internalIP, err := aws.metadata.GetMetadata("local-ipv4")
 		if err != nil {
 			return nil, err
 		}
+		addresses = append(addresses, api.NodeAddress{Type: api.NodeInternalIP, Address: internalIP})
+		addresses = append(addresses, api.NodeAddress{Type: api.NodeLegacyHostIP, Address: internalIP})
+
 		externalIP, err := aws.metadata.GetMetadata("public-ipv4")
 		if err != nil {
-			return nil, err
+			//Perhaps only log this as a warning the first time this method is called?
+		} else {
+			addresses = append(addresses, api.NodeAddress{Type: api.NodeExternalIP, Address: externalIP})
 		}
-		return []api.NodeAddress{
-			{Type: api.NodeInternalIP, Address: internalIP},
-			{Type: api.NodeLegacyHostIP, Address: internalIP},
-			{Type: api.NodeExternalIP, Address: externalIP},
-		}, nil
+
+		return addresses, nil
 	}
 	instance, err := aws.getInstanceByNodeName(name)
 	if err != nil {