support ovn eip nats dualstack (#3822)

* support ovn eip nats dualstack --------- Signed-off-by: bobz965 <[email protected]>
kubeovn · May 7, 2024 · 81b40c3 · 81b40c3
1 parent 02f876f
commit 81b40c3
Show file tree

Hide file tree

Showing 10 changed files with 479 additions and 322 deletions.
diff --git a/charts/kube-ovn/templates/kube-ovn-crd.yaml b/charts/kube-ovn/templates/kube-ovn-crd.yaml
@@ -1268,9 +1268,15 @@ spec:
       - jsonPath: .status.v4Eip
         name: V4Eip
         type: string
+      - jsonPath: .status.v6Eip
+        name: V6Eip
+        type: string
       - jsonPath: .status.v4Ip
         name: V4Ip
         type: string
+      - jsonPath: .status.v6Ip
+        name: V6Ip
+        type: string
       - jsonPath: .status.ready
         name: Ready
         type: boolean
@@ -1325,6 +1331,8 @@ spec:
                   type: string
                 v4Ip:
                   type: string
+                v6Ip:
+                  type: string
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1353,9 +1361,15 @@ spec:
       - jsonPath: .status.v4Eip
         name: V4Eip
         type: string
+      - jsonPath: .status.v6Eip
+        name: V6Eip
+        type: string
       - jsonPath: .status.v4IpCidr
         name: V4IpCidr
         type: string
+      - jsonPath: .status.v6IpCidr
+        name: V6IpCidr
+        type: string
       - jsonPath: .status.ready
         name: Ready
         type: boolean
@@ -1370,8 +1384,12 @@ spec:
                   type: boolean
                 v4Eip:
                   type: string
+                v6Eip:
+                  type: string
                 v4IpCidr:
                   type: string
+                v6IpCidr:
+                  type: string
                 vpc:
                   type: string
                 conditions:
@@ -1404,6 +1422,8 @@ spec:
                   type: string
                 v4IpCidr:
                   type: string
+                v6IpCidr:
+                  type: string
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1438,9 +1458,15 @@ spec:
         - jsonPath: .status.v4Eip
           name: V4Eip
           type: string
+        - jsonPath: .status.v6Eip
+          name: V6Eip
+          type: string
         - jsonPath: .status.v4Ip
           name: V4Ip
           type: string
+        - jsonPath: .status.v6Ip
+          name: V6Ip
+          type: string
         - jsonPath: .status.internalPort
           name: InternalPort
           type: string
@@ -1512,6 +1538,8 @@ spec:
                   type: string
                 v4Ip:
                   type: string
+                v6Ip:
+                  type: string
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1496,9 +1496,15 @@ spec:
       - jsonPath: .status.v4Eip
         name: V4Eip
         type: string
+      - jsonPath: .status.v6Eip
+        name: V6Eip
+        type: string
       - jsonPath: .status.v4Ip
         name: V4Ip
         type: string
+      - jsonPath: .status.v6Ip
+        name: V6Ip
+        type: string
       - jsonPath: .status.ready
         name: Ready
         type: boolean
@@ -1553,6 +1559,8 @@ spec:
                   type: string
                 v4Ip:
                   type: string
+                v6Ip:
+                  type: string
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1581,9 +1589,15 @@ spec:
       - jsonPath: .status.v4Eip
         name: V4Eip
         type: string
+      - jsonPath: .status.v6Eip
+        name: V6Eip
+        type: string
       - jsonPath: .status.v4IpCidr
         name: V4IpCidr
         type: string
+      - jsonPath: .status.v6IpCidr
+        name: V6IpCidr
+        type: string
       - jsonPath: .status.ready
         name: Ready
         type: boolean
@@ -1598,8 +1612,12 @@ spec:
                   type: boolean
                 v4Eip:
                   type: string
+                v6Eip:
+                  type: string
                 v4IpCidr:
                   type: string
+                v6IpCidr:
+                  type: string
                 vpc:
                   type: string
                 conditions:
@@ -1632,6 +1650,8 @@ spec:
                   type: string
                 v4IpCidr:
                   type: string
+                v6IpCidr:
+                  type: string
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1666,9 +1686,15 @@ spec:
         - jsonPath: .status.v4Eip
           name: V4Eip
           type: string
+        - jsonPath: .status.v6Eip
+          name: V6Eip
+          type: string
         - jsonPath: .status.v4Ip
           name: V4Ip
           type: string
+        - jsonPath: .status.v6Ip
+          name: V6Ip
+          type: string
         - jsonPath: .status.internalPort
           name: InternalPort
           type: string
@@ -1740,6 +1766,8 @@ spec:
                   type: string
                 v4Ip:
                   type: string
+                v6Ip:
+                  type: string
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -1008,6 +1008,7 @@ type OvnFipSpec struct {
 	IPName string `json:"ipName"` // vip, ip crd name
 	Vpc    string `json:"vpc"`
 	V4Ip   string `json:"v4Ip"`
+	V6Ip   string `json:"v6Ip"`
 }
 
 // OvnFipCondition describes the state of an object at a certain point.
@@ -1019,7 +1020,9 @@ type OvnFipStatus struct {
 	// +patchStrategy=merge
 	Vpc   string `json:"vpc" patchStrategy:"merge"`
 	V4Eip string `json:"v4Eip" patchStrategy:"merge"`
+	V6Eip string `json:"v6Eip" patchStrategy:"merge"`
 	V4Ip  string `json:"v4Ip" patchStrategy:"merge"`
+	V6Ip  string `json:"v6Ip" patchStrategy:"merge"`
 	Ready bool   `json:"ready" patchStrategy:"merge"`
 
 	// Conditions represents the latest state of the object
@@ -1057,6 +1060,7 @@ type OvnSnatRuleSpec struct {
 	IPName    string `json:"ipName"`
 	Vpc       string `json:"vpc"`
 	V4IpCidr  string `json:"v4IpCidr"` // subnet cidr or pod ip address
+	V6IpCidr  string `json:"v6IpCidr"` // subnet cidr or pod ip address
 }
 
 // OvnSnatRuleCondition describes the state of an object at a certain point.
@@ -1068,7 +1072,9 @@ type OvnSnatRuleStatus struct {
 	// +patchStrategy=merge
 	Vpc      string `json:"vpc" patchStrategy:"merge"`
 	V4Eip    string `json:"v4Eip" patchStrategy:"merge"`
+	V6Eip    string `json:"v6Eip" patchStrategy:"merge"`
 	V4IpCidr string `json:"v4IpCidr" patchStrategy:"merge"`
+	V6IpCidr string `json:"v6IpCidr" patchStrategy:"merge"`
 	Ready    bool   `json:"ready" patchStrategy:"merge"`
 
 	// Conditions represents the latest state of the object
@@ -1109,6 +1115,7 @@ type OvnDnatRuleSpec struct {
 	Protocol     string `json:"protocol,omitempty"`
 	Vpc          string `json:"vpc"`
 	V4Ip         string `json:"v4Ip"`
+	V6Ip         string `json:"v6Ip"`
 }
 
 // OvnDnatRuleCondition describes the state of an object at a certain point.
@@ -1121,8 +1128,10 @@ type OvnDnatRuleStatus struct {
 	// +patchStrategy=merge
 	Vpc          string `json:"vpc" patchStrategy:"merge"`
 	V4Eip        string `json:"v4Eip" patchStrategy:"merge"`
+	V6Eip        string `json:"v6Eip" patchStrategy:"merge"`
 	ExternalPort string `json:"externalPort"`
 	V4Ip         string `json:"v4Ip" patchStrategy:"merge"`
+	V6Ip         string `json:"v6Ip" patchStrategy:"merge"`
 	InternalPort string `json:"internalPort"`
 	Protocol     string `json:"protocol,omitempty"`
 	IPName       string `json:"ipName"`