fix: Consider ipv6 single stack case when checking pip name and pip prefix id

Author: nilo19

pkg/provider/azure_loadbalancer_test.go

@@ -2453,6 +2453,8 @@ func TestDeterminePublicIPName(t *testing.T) {
 		expectedPIPName string
 		expectedError   bool
 		isIPv6          bool
+		serviceIPv6     bool
+		annotations     map[string]string
 	}{
 		{
 			desc: "determinePublicIpName shall get public IP from az.getPublicIPName if no specific " +
@@ -2481,12 +2483,22 @@ func TestDeterminePublicIPName(t *testing.T) {
 			expectedPIPName: "pipName",
 			expectedError:   false,
 		},
+		{
+			desc: "determinePublicIpName shall use IPv6 pip annotation for IPv6 single stack service",
+			annotations: map[string]string{
+				consts.ServiceAnnotationPIPNameDualStack[true]: "service-lb-public-IP3dbe-v6",
+			},
+			expectedPIPName: "service-lb-public-IP3dbe-v6",
+			isIPv6:          true,
+			serviceIPv6:     true,
+			expectedError:   false,
+		},
 	}
 
 	for _, test := range testCases {
 		t.Run(test.desc, func(t *testing.T) {
 			az := GetTestCloud(ctrl)
-			service := getTestService("test1", v1.ProtocolTCP, nil, false, 80)
+			service := getTestService("test1", v1.ProtocolTCP, test.annotations, test.serviceIPv6, 80)
 			setServiceLoadBalancerIP(&service, test.loadBalancerIP)
 
 			mockPIPsClient := az.NetworkClientFactory.GetPublicIPAddressClient().(*mock_publicipaddressclient.MockInterface)

pkg/provider/azure_utils.go

@@ -377,6 +377,12 @@ func getServicePIPName(service *v1.Service, isIPv6 bool) string {
 	}
 
 	if !isServiceDualStack(service) {
+		v4Enabled, v6Enabled := getIPFamiliesEnabled(service)
+		if isIPv6 && v6Enabled && !v4Enabled {
+			if name := service.Annotations[consts.ServiceAnnotationPIPNameDualStack[true]]; name != "" {
+				return name
+			}
+		}
 		return service.Annotations[consts.ServiceAnnotationPIPNameDualStack[false]]
 	}
 
@@ -397,6 +403,12 @@ func getServicePIPPrefixID(service *v1.Service, isIPv6 bool) string {
 	}
 
 	if !isServiceDualStack(service) {
+		v4Enabled, v6Enabled := getIPFamiliesEnabled(service)
+		if isIPv6 && v6Enabled && !v4Enabled {
+			if id := service.Annotations[consts.ServiceAnnotationPIPPrefixIDDualStack[true]]; id != "" {
+				return id
+			}
+		}
 		return service.Annotations[consts.ServiceAnnotationPIPPrefixIDDualStack[false]]
 	}
 

pkg/provider/azure_utils_test.go

@@ -794,7 +794,7 @@ func TestGetServicePIPName(t *testing.T) {
 			&v1.Service{
 				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{
-						consts.ServiceAnnotationPIPNameDualStack[false]: "pip-name-ipv6",
+						consts.ServiceAnnotationPIPNameDualStack[true]: "pip-name-ipv6",
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -836,6 +836,21 @@ func TestGetServicePIPName(t *testing.T) {
 			true,
 			"pip-name-ipv6",
 		},
+		{
+			"From ServiceAnnotationPIPName IPv6 single stack fallback",
+			&v1.Service{
+				ObjectMeta: metav1.ObjectMeta{
+					Annotations: map[string]string{
+						consts.ServiceAnnotationPIPNameDualStack[false]: "pip-name-ipv6",
+					},
+				},
+				Spec: v1.ServiceSpec{
+					IPFamilies: []v1.IPFamily{v1.IPv6Protocol},
+				},
+			},
+			true,
+			"pip-name-ipv6",
+		},
 	}
 	for _, tc := range testcases {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -872,7 +887,7 @@ func TestGetServicePIPPrefixID(t *testing.T) {
 			&v1.Service{
 				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{
-						consts.ServiceAnnotationPIPPrefixIDDualStack[false]: "pip-prefix-id-ipv6",
+						consts.ServiceAnnotationPIPPrefixIDDualStack[true]: "pip-prefix-id-ipv6",
 					},
 				},
 				Spec: v1.ServiceSpec{
@@ -914,6 +929,21 @@ func TestGetServicePIPPrefixID(t *testing.T) {
 			true,
 			"pip-prefix-id-ipv6",
 		},
+		{
+			"From ServiceAnnotationPIPPrefixIDDualStack IPv6 single stack fallback",
+			&v1.Service{
+				ObjectMeta: metav1.ObjectMeta{
+					Annotations: map[string]string{
+						consts.ServiceAnnotationPIPPrefixIDDualStack[false]: "pip-prefix-id-ipv6",
+					},
+				},
+				Spec: v1.ServiceSpec{
+					IPFamilies: []v1.IPFamily{v1.IPv6Protocol},
+				},
+			},
+			true,
+			"pip-prefix-id-ipv6",
+		},
 	}
 	for _, tc := range testcases {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -923,6 +953,22 @@ func TestGetServicePIPPrefixID(t *testing.T) {
 	}
 }
 
+func TestGetServicePIPNames(t *testing.T) {
+	svc := &v1.Service{
+		ObjectMeta: metav1.ObjectMeta{
+			Annotations: map[string]string{
+				consts.ServiceAnnotationPIPNameDualStack[true]: "pip-name-ipv6",
+			},
+		},
+		Spec: v1.ServiceSpec{
+			IPFamilies: []v1.IPFamily{v1.IPv6Protocol},
+		},
+	}
+
+	names := getServicePIPNames(svc)
+	assert.Equal(t, []string{"", "pip-name-ipv6"}, names)
+}
+
 func TestGetResourceByIPFamily(t *testing.T) {
 	testcases := []struct {
 		desc             string