github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix AWS kubelet registration.

Browse Source 
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.
This commit is contained in:
David Pratt 2016-01-21 12:42:55 -06:00
parent 9942f6bf3e
commit adde7f548f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/cloudprovider/providers/aws/aws.go
View File

@ -650,19 +650,23 @@ func (aws *AWSCloud) NodeAddresses(name string) ([]api.NodeAddress, error) {
return nil, err return nil, err
} }
if self.nodeName == name || len(name) == 0 { if self.nodeName == name || len(name) == 0 {
addresses := []api.NodeAddress{}
internalIP, err := aws.metadata.GetMetadata("local-ipv4") internalIP, err := aws.metadata.GetMetadata("local-ipv4")
if err != nil { if err != nil {
return nil, err 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") externalIP, err := aws.metadata.GetMetadata("public-ipv4")
if err != nil { 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}, return addresses, nil
{Type: api.NodeLegacyHostIP, Address: internalIP},
{Type: api.NodeExternalIP, Address: externalIP},
}, nil
} }
instance, err := aws.getInstanceByNodeName(name) instance, err := aws.getInstanceByNodeName(name)
if err != nil { if err != nil {