Include IPv6 addresses in Machine status

This includes any IPv6 addresses associated with an instance's network
interfaces in the Machine object's status.  They are listed with type
NodeInternalIP to match what KNI is doing:

  openshift-kni/origin@7db21c1

pkg/actuators/machine/utils.go

@@ -388,6 +388,20 @@ func extractNodeAddresses(instance *ec2.Instance) ([]corev1.NodeAddress, error)
 			continue
 		}
 
+		// Treating IPv6 addresses as type NodeInternalIP to match what the KNI
+		// patch to the AWS cloud-provider code is doing:
+		//
+		// https://github.com/openshift-kni/origin/commit/7db21c1e26a344e25ae1b825d4f21e7bef5c3650
+		for _, ipv6Address := range networkInterface.Ipv6Addresses {
+			if addr := aws.StringValue(ipv6Address.Ipv6Address); addr != "" {
+				ip := net.ParseIP(addr)
+				if ip == nil {
+					return nil, fmt.Errorf("EC2 instance had invalid IPv6 address: %s (%q)", aws.StringValue(instance.InstanceId), addr)
+				}
+				addresses = append(addresses, corev1.NodeAddress{Type: corev1.NodeInternalIP, Address: ip.String()})
+			}
+		}
+
 		for _, internalIP := range networkInterface.PrivateIpAddresses {
 			if ipAddress := aws.StringValue(internalIP.PrivateIpAddress); ipAddress != "" {
 				ip := net.ParseIP(ipAddress)

pkg/actuators/machine/utils_test.go

@@ -161,6 +161,34 @@ func TestExtractNodeAddresses(t *testing.T) {
 				{Type: corev1.NodeHostName, Address: "ec2.example.net"},
 			},
 		},
+		{
+			testcase: "ipv6-private",
+			instance: &ec2.Instance{
+				PrivateDnsName: aws.String("ec2.example.net"),
+				NetworkInterfaces: []*ec2.InstanceNetworkInterface{
+					{
+						Status: aws.String(ec2.NetworkInterfaceStatusInUse),
+						Ipv6Addresses: []*ec2.InstanceIpv6Address{
+							{
+								Ipv6Address: aws.String("2600:1f18:4254:5100:ef8a:7b65:7782:9248"),
+							},
+						},
+						PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
+							{
+								Primary:          aws.Bool(true),
+								PrivateIpAddress: aws.String("10.0.0.5"),
+							},
+						},
+					},
+				},
+			},
+			expectedAddresses: []corev1.NodeAddress{
+				{Type: corev1.NodeInternalIP, Address: "2600:1f18:4254:5100:ef8a:7b65:7782:9248"},
+				{Type: corev1.NodeInternalIP, Address: "10.0.0.5"},
+				{Type: corev1.NodeInternalDNS, Address: "ec2.example.net"},
+				{Type: corev1.NodeHostName, Address: "ec2.example.net"},
+			},
+		},
 	}
 
 	for _, tc := range testCases {