From 0a5f0127e1ba5965a3f590e3fd2ac3fa629cfe46 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 22 Aug 2018 11:49:32 -0400 Subject: [PATCH] Make aws cloud provider report a node hostname address --- pkg/cloudprovider/providers/aws/aws.go | 2 ++ pkg/cloudprovider/providers/aws/aws_test.go | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 2cc06409dab..f28e91e4ed8 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -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.") } else { 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") @@ -1307,6 +1308,7 @@ func extractNodeAddresses(instance *ec2.Instance) ([]v1.NodeAddress, error) { privateDNSName := aws.StringValue(instance.PrivateDnsName) if 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) diff --git a/pkg/cloudprovider/providers/aws/aws_test.go b/pkg/cloudprovider/providers/aws/aws_test.go index df7029bc255..acc60764a81 100644 --- a/pkg/cloudprovider/providers/aws/aws_test.go +++ b/pkg/cloudprovider/providers/aws/aws_test.go @@ -348,13 +348,14 @@ func TestNodeAddresses(t *testing.T) { if err3 != nil { t.Errorf("Should not error when instance found") } - if len(addrs3) != 4 { - t.Errorf("Should return exactly 4 NodeAddresses") + if len(addrs3) != 5 { + t.Errorf("Should return exactly 5 NodeAddresses") } testHasNodeAddress(t, addrs3, v1.NodeInternalIP, "192.168.0.1") testHasNodeAddress(t, addrs3, v1.NodeExternalIP, "1.2.3.4") testHasNodeAddress(t, addrs3, v1.NodeExternalDNS, "instance-same.ec2.external") testHasNodeAddress(t, addrs3, v1.NodeInternalDNS, "instance-same.ec2.internal") + testHasNodeAddress(t, addrs3, v1.NodeHostName, "instance-same.ec2.internal") } func TestNodeAddressesWithMetadata(t *testing.T) {