Merge pull request #381 from orenc1/fix_getNodeAddresses

Fix dual-stack IP support in getNodeAddresses

Author: kubevirt-bot

pkg/provider/instances_v2.go

@@ -136,17 +136,22 @@ func (i *instancesV2) getNodeAddresses(ifs []kubevirtv1.VirtualMachineInstanceNe
 	var addrs []corev1.NodeAddress
 
 	foundInternalIP := false
-	// TODO: detect type of all addresses, right now pick only the default
-	for _, i := range ifs {
-		// Only change the IP if it is known, not if it is empty
-		if i.Name == "default" && i.IP != "" {
-			v1helper.AddToNodeAddresses(&addrs, corev1.NodeAddress{
-				Type:    corev1.NodeInternalIP,
-				Address: i.IP,
-			})
-			foundInternalIP = true
-			break
+	// Find the default interface and add all its IP addresses (supports dual-stack)
+	for _, iface := range ifs {
+		if iface.Name != "default" {
+			continue
+		}
+
+		for _, ip := range iface.IPs {
+			if ip != "" {
+				v1helper.AddToNodeAddresses(&addrs, corev1.NodeAddress{
+					Type:    corev1.NodeInternalIP,
+					Address: ip,
+				})
+				foundInternalIP = true
+			}
 		}
+		break
 	}
 
 	// fall back to the previously known internal IP on the node

pkg/provider/instances_v2_test.go

@@ -238,6 +238,7 @@ var _ = Describe("Instances V2", func() {
 						Interfaces: []kubevirtv1.VirtualMachineInstanceNetworkInterface{
 							{
 								IP:   "10.244.0.1",
+								IPs:  []string{"10.244.0.1"},
 								Name: "default",
 							},
 							{
@@ -298,6 +299,90 @@ var _ = Describe("Instances V2", func() {
 				}))
 			})
 
+			It("Should return dual-stack IPs when VMI has both IPv4 and IPv6 addresses", func() {
+				vmiName := "test-vm-dualstack"
+				namespace := "cluster-qwedas"
+				i := instancesV2{
+					namespace: namespace,
+					client:    mockClient,
+					config: &InstancesV2Config{
+						Enabled:              true,
+						ZoneAndRegionEnabled: true,
+					},
+				}
+
+				infraNode := corev1.Node{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "infra-node",
+						Labels: map[string]string{
+							corev1.LabelTopologyRegion: "region-a",
+							corev1.LabelTopologyZone:   "zone-1",
+						},
+					},
+				}
+
+				vmi := kubevirtv1.VirtualMachineInstance{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      vmiName,
+						Namespace: namespace,
+						Annotations: map[string]string{
+							kubevirtv1.InstancetypeAnnotation: "highPerformance",
+						},
+					},
+					Status: kubevirtv1.VirtualMachineInstanceStatus{
+						Interfaces: []kubevirtv1.VirtualMachineInstanceNetworkInterface{
+							{
+								IP:   "10.129.0.209",
+								IPs:  []string{"10.129.0.209", "fd02:0:0:2::13c2"},
+								Name: "default",
+							},
+						},
+						NodeName: infraNode.Name,
+					},
+				}
+
+				tenantNode := corev1.Node{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: vmiName,
+					},
+				}
+
+				gomock.InOrder(
+					mockClient.EXPECT().
+						Get(ctx, types.NamespacedName{Name: vmiName, Namespace: namespace}, gomock.AssignableToTypeOf(&kubevirtv1.VirtualMachineInstance{})).
+						SetArg(2, vmi).
+						Times(1),
+					mockClient.EXPECT().
+						Get(ctx, client.ObjectKey{Name: infraNode.Name}, gomock.AssignableToTypeOf(&corev1.Node{})).
+						SetArg(2, infraNode).
+						Times(1),
+				)
+
+				metadata, err := i.InstanceMetadata(ctx, &tenantNode)
+				Expect(err).To(BeNil())
+
+				idFn := func(index int, element interface{}) string {
+					return strconv.Itoa(index)
+				}
+				Expect(*metadata).To(MatchAllFields(Fields{
+					"ProviderID": Equal("kubevirt://test-vm-dualstack"),
+					"NodeAddresses": MatchAllElementsWithIndex(idFn, Elements{
+						"0": MatchAllFields(Fields{
+							"Address": Equal("10.129.0.209"),
+							"Type":    Equal(corev1.NodeInternalIP),
+						}),
+						"1": MatchAllFields(Fields{
+							"Address": Equal("fd02:0:0:2::13c2"),
+							"Type":    Equal(corev1.NodeInternalIP),
+						}),
+					}),
+					"InstanceType":     Equal("highPerformance"),
+					"Region":           Equal("region-a"),
+					"Zone":             Equal("zone-1"),
+					"AdditionalLabels": BeEmpty(),
+				}))
+			})
+
 			It("Should fetch a vmi by node name and return a complete metadata object - zone and region disabled", func() {
 				vmiName := "test-vm"
 				namespace := "cluster-qwedas"
@@ -331,16 +416,9 @@ var _ = Describe("Instances V2", func() {
 					Status: kubevirtv1.VirtualMachineInstanceStatus{
 						Interfaces: []kubevirtv1.VirtualMachineInstanceNetworkInterface{
 							{
-								IP:   "10.244.0.1",
+								IPs:  []string{"10.244.0.1"},
 								Name: "default",
 							},
-							{
-								IP:   "10.245.0.1",
-								Name: "unknown",
-							},
-							{
-								IP: "10.246.0.1",
-							},
 						},
 						NodeName: infraNode.Name,
 					},