ovn fip spec distributed and support v4:v6 v6:v4 (#5283)

* custom ovn fip has its own type to cut the relationship with ovn-cluster enable eip snat

1. vpc ovn-fip could set its own distributed 
2. ovn-fip support v4:v4 v4:v6

---------

Signed-off-by: zbb88888 <[email protected]>

Author: zbb88888

charts/kube-ovn-v2/crds/kube-ovn-crd.yaml

@@ -1649,6 +1649,9 @@ spec:
         - jsonPath: .status.vpc
           name: Vpc
           type: string
+        - jsonPath: .spec.type
+          name: Type
+          type: string
         - jsonPath: .status.v4Eip
           name: V4Eip
           type: string
@@ -1713,6 +1716,8 @@ spec:
                   type: string
                 ipType:
                   type: string
+                type:
+                  type: string
                 ipName:
                   type: string
                 vpc:

charts/kube-ovn/templates/kube-ovn-crd.yaml

@@ -1665,6 +1665,9 @@ spec:
       - jsonPath: .status.vpc
         name: Vpc
         type: string
+      - jsonPath: .spec.type
+        name: Type
+        type: string
       - jsonPath: .status.v4Eip
         name: V4Eip
         type: string
@@ -1729,6 +1732,8 @@ spec:
                   type: string
                 ipType:
                   type: string
+                type:
+                  type: string
                 ipName:
                   type: string
                 vpc:

dist/images/install.sh

@@ -1906,6 +1906,9 @@ spec:
       - jsonPath: .status.vpc
         name: Vpc
         type: string
+      - jsonPath: .spec.type
+        name: Type
+        type: string
       - jsonPath: .status.v4Eip
         name: V4Eip
         type: string
@@ -1970,6 +1973,8 @@ spec:
                   type: string
                 ipType:
                   type: string
+                type:
+                  type: string
                 ipName:
                   type: string
                 vpc:

pkg/apis/kubeovn/v1/ovn-fip.go

@@ -34,6 +34,7 @@ type OvnFipSpec struct {
 	Vpc    string `json:"vpc"`
 	V4Ip   string `json:"v4Ip"`
 	V6Ip   string `json:"v6Ip"`
+	Type   string `json:"type"` // distributed, centralized
 }
 
 type OvnFipStatus struct {

pkg/controller/ovn_fip.go

@@ -177,16 +177,42 @@ func (c *Controller) handleAddOvnFip(key string) error {
 		return err
 	}
 	// ovn add fip
-	options := map[string]string{"staleless": strconv.FormatBool(c.ExternalGatewayType == kubeovnv1.GWDistributedType)}
+	var staleless bool
+	if cachedFip.Spec.Type != "" {
+		staleless = (cachedFip.Spec.Type == kubeovnv1.GWDistributedType)
+	} else {
+		staleless = (c.ExternalGatewayType == kubeovnv1.GWDistributedType)
+	}
+	options := map[string]string{"staleless": strconv.FormatBool(staleless)}
+
+	// support v4:v4
 	if v4IP != "" && v4Eip != "" {
 		if err = c.OVNNbClient.AddNat(vpcName, ovnnb.NATTypeDNATAndSNAT, v4Eip, v4IP, mac, cachedFip.Spec.IPName, options); err != nil {
-			klog.Errorf("failed to create v4 fip, %v", err)
+			klog.Errorf("failed to create v4:v4 fip, %v", err)
 			return err
 		}
 	}
-	if v6Eip == "" && v6IP != "" {
+
+	// support v6:v6
+	if v6IP != "" && v6Eip != "" {
 		if err = c.OVNNbClient.AddNat(vpcName, ovnnb.NATTypeDNATAndSNAT, v6Eip, v6IP, mac, cachedFip.Spec.IPName, options); err != nil {
-			klog.Errorf("failed to create v6 fip, %v", err)
+			klog.Errorf("failed to create v6:v6 fip, %v", err)
+			return err
+		}
+	}
+
+	// support v4:v6
+	if v4IP != "" && v6IP == "" && v4Eip == "" && v6Eip != "" {
+		if err = c.OVNNbClient.AddNat(vpcName, ovnnb.NATTypeDNATAndSNAT, v6Eip, v4IP, mac, cachedFip.Spec.IPName, options); err != nil {
+			klog.Errorf("failed to create v4:v6 fip, %v", err)
+			return err
+		}
+	}
+
+	// support v6:v4
+	if v6IP != "" && v4IP == "" && v6Eip == "" && v4Eip != "" {
+		if err = c.OVNNbClient.AddNat(vpcName, ovnnb.NATTypeDNATAndSNAT, v4Eip, v6IP, mac, cachedFip.Spec.IPName, options); err != nil {
+			klog.Errorf("failed to create v6:v4 fip, %v", err)
 			return err
 		}
 	}