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

Make aws cloud provider report a node hostname address

Browse Source
This commit is contained in:
Jordan Liggitt 2018-08-22 11:49:32 -04:00
parent 0e31372b2f
commit 0a5f0127e1
No known key found for this signature in database
GPG Key ID: 39928704103C7229
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1245,6 +1245,7 @@ func (c *Cloud) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1.No
glog.V(4).Info("Could not determine private DNS from AWS metadata.") glog.V(4).Info("Could not determine private DNS from AWS metadata.")
} else { } else {
addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalDNS, Address: internalDNS}) addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalDNS, Address: internalDNS})
addresses = append(addresses, v1.NodeAddress{Type: v1.NodeHostName, Address: internalDNS})
} }
externalDNS, err := c.metadata.GetMetadata("public-hostname") externalDNS, err := c.metadata.GetMetadata("public-hostname")
@ -1307,6 +1308,7 @@ func extractNodeAddresses(instance *ec2.Instance) ([]v1.NodeAddress, error) {
privateDNSName := aws.StringValue(instance.PrivateDnsName) privateDNSName := aws.StringValue(instance.PrivateDnsName)
if privateDNSName != "" { if privateDNSName != "" {
addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalDNS, Address: privateDNSName}) addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalDNS, Address: privateDNSName})
addresses = append(addresses, v1.NodeAddress{Type: v1.NodeHostName, Address: privateDNSName})
} }
publicDNSName := aws.StringValue(instance.PublicDnsName) publicDNSName := aws.StringValue(instance.PublicDnsName)

5
pkg/cloudprovider/providers/aws/aws_test.go
View File

@ -348,13 +348,14 @@ func TestNodeAddresses(t *testing.T) {
if err3 != nil { if err3 != nil {
t.Errorf("Should not error when instance found") t.Errorf("Should not error when instance found")
} }
if len(addrs3) != 4 { if len(addrs3) != 5 {
t.Errorf("Should return exactly 4 NodeAddresses") t.Errorf("Should return exactly 5 NodeAddresses")
} }
testHasNodeAddress(t, addrs3, v1.NodeInternalIP, "192.168.0.1") testHasNodeAddress(t, addrs3, v1.NodeInternalIP, "192.168.0.1")
testHasNodeAddress(t, addrs3, v1.NodeExternalIP, "1.2.3.4") testHasNodeAddress(t, addrs3, v1.NodeExternalIP, "1.2.3.4")
testHasNodeAddress(t, addrs3, v1.NodeExternalDNS, "instance-same.ec2.external") testHasNodeAddress(t, addrs3, v1.NodeExternalDNS, "instance-same.ec2.external")
testHasNodeAddress(t, addrs3, v1.NodeInternalDNS, "instance-same.ec2.internal") testHasNodeAddress(t, addrs3, v1.NodeInternalDNS, "instance-same.ec2.internal")
testHasNodeAddress(t, addrs3, v1.NodeHostName, "instance-same.ec2.internal")
} }
func TestNodeAddressesWithMetadata(t *testing.T) { func TestNodeAddressesWithMetadata(t *testing.T) {