fix empty provider

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

Author: zbb88888

pkg/util/vpc_nat_gateway.go

@@ -61,15 +61,19 @@ func GenNatGwSelectors(selectors []string) map[string]string {
 // GenNatGwPodAnnotations returns the Pod annotations for a NAT gateway
 // additionalNetworks is optional, used when user specifies extra NADs in gw.Annotations
 func GenNatGwPodAnnotations(gw *kubeovnv1.VpcNatGateway, externalNadNamespace, externalNadName, provider, additionalNetworks string) map[string]string {
+	p := provider
+	if p == "" {
+		p = OvnProvider
+	}
 	attachedNetworks := fmt.Sprintf("%s/%s", externalNadNamespace, externalNadName)
 	if additionalNetworks != "" {
 		attachedNetworks = additionalNetworks + ", " + attachedNetworks
 	}
 	return map[string]string{
-		fmt.Sprintf(VpcNatGatewayAnnotationTemplate, provider): gw.Name,
-		nadv1.NetworkAttachmentAnnot:                           attachedNetworks,
-		fmt.Sprintf(LogicalSwitchAnnotationTemplate, provider): gw.Spec.Subnet,
-		fmt.Sprintf(IPAddressAnnotationTemplate, provider):     gw.Spec.LanIP,
+		fmt.Sprintf(VpcNatGatewayAnnotationTemplate, p): gw.Name,
+		nadv1.NetworkAttachmentAnnot:                    attachedNetworks,
+		fmt.Sprintf(LogicalSwitchAnnotationTemplate, p): gw.Spec.Subnet,
+		fmt.Sprintf(IPAddressAnnotationTemplate, p):     gw.Spec.LanIP,
 	}
 }
 

pkg/util/vpc_nat_gateway_test.go

@@ -270,6 +270,28 @@ func TestGenNatGwPodAnnotations(t *testing.T) {
 		additionalNetworks   string
 		expected             map[string]string
 	}{
+		{
+			name: "Empty provider defaults to ovn",
+			gw: v1.VpcNatGateway{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-gateway",
+				},
+				Spec: v1.VpcNatGatewaySpec{
+					Subnet: "internal-subnet",
+					LanIP:  "10.20.30.40",
+				},
+			},
+			externalNadName:      "external-subnet",
+			externalNadNamespace: metav1.NamespaceSystem,
+			provider:             "",
+			additionalNetworks:   "",
+			expected: map[string]string{
+				VpcNatGatewayAnnotation:      "test-gateway",
+				nadv1.NetworkAttachmentAnnot: "kube-system/external-subnet",
+				LogicalSwitchAnnotation:      "internal-subnet",
+				IPAddressAnnotation:          "10.20.30.40",
+			},
+		},
 		{
 			name: "All fields provided with ovn provider",
 			gw: v1.VpcNatGateway{