github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 07:13:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20372 from dpratt/aws-private-ip

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-09 13:38:22 -08:00
commit 8d964a7ddf
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -650,19 +650,26 @@ 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})
// Legacy compatibility: the private ip was the legacy host ip
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 //TODO: It would be nice to be able to determine the reason for the failure,
// but the AWS client masks all failures with the same error description.
glog.V(2).Info("Could not determine public IP from AWS metadata.")
} 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 {