Update Egress API to support multiple Egress IPs and pools (antrea-io…

…#4603) Nodes in a cluster could reside in multiple subnets, but the egress IP needs to be routable in the underlay network and usually resides in the same subnet of the Node hosting it. Therefore, there may be a situation where no available nodes are eligible to host an egress IP address if all Nodes in a subnet are down, interrupting egress traffic of the workloads that use the IP. As the first step of supporting the above scenario, the patch extends the Egress IP to support multiple Egress IPs and pools so that one Egress IP can be configured for each subnet, making Egress failover across the whole cluster possible. Besides, it also adds a field, `status.egressIP`, to represent the effective Egress IP. When there is no eligible Node for any of the Egress IPs, the field will be empty. Signed-off-by: Quan Tian <[email protected]>
rajnkamr · May 4, 2023 · e635aef · e635aef
1 parent e40aacb
commit e635aef
Show file tree

Hide file tree

Showing 13 changed files with 309 additions and 75 deletions.
diff --git a/build/charts/antrea/crds/egress.yaml b/build/charts/antrea/crds/egress.yaml
@@ -20,11 +20,17 @@ spec:
             type: object
             required:
             - appliedTo
-            anyOf:
-            - required:
-              - egressIP
-            - required:
-              - externalIPPool
+            oneOf:
+            - anyOf:
+              - required:
+                - egressIP
+              - required:
+                - externalIPPool
+            - anyOf:
+              - required:
+                - egressIPs
+              - required:
+                - externalIPPools
             properties:
               appliedTo:
                 type: object
@@ -82,16 +88,30 @@ spec:
                 oneOf:
                 - format: ipv4
                 - format: ipv6
+              egressIPs:
+                type: array
+                items:
+                  type: string
+                  oneOf:
+                  - maxLength: 0
+                  - format: ipv4
+                  - format: ipv6
               externalIPPool:
                 type: string
+              externalIPPools:
+                type: array
+                items:
+                  type: string
           status:
             type: object
             properties:
               egressNode:
                 type: string
+              egressIP:
+                type: string
     additionalPrinterColumns:
-    - description: Specifies the SNAT IP address for the selected workloads.
-      jsonPath: .spec.egressIP
+    - description: The effective SNAT IP address for the selected workloads.
+      jsonPath: .status.egressIP
       name: EgressIP
       type: string
     - jsonPath: .metadata.creationTimestamp

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -1083,11 +1083,17 @@ spec:
             type: object
             required:
             - appliedTo
-            anyOf:
-            - required:
-              - egressIP
-            - required:
-              - externalIPPool
+            oneOf:
+            - anyOf:
+              - required:
+                - egressIP
+              - required:
+                - externalIPPool
+            - anyOf:
+              - required:
+                - egressIPs
+              - required:
+                - externalIPPools
             properties:
               appliedTo:
                 type: object
@@ -1145,16 +1151,30 @@ spec:
                 oneOf:
                 - format: ipv4
                 - format: ipv6
+              egressIPs:
+                type: array
+                items:
+                  type: string
+                  oneOf:
+                  - maxLength: 0
+                  - format: ipv4
+                  - format: ipv6
               externalIPPool:
                 type: string
+              externalIPPools:
+                type: array
+                items:
+                  type: string
           status:
             type: object
             properties:
               egressNode:
                 type: string
+              egressIP:
+                type: string
     additionalPrinterColumns:
-    - description: Specifies the SNAT IP address for the selected workloads.
-      jsonPath: .spec.egressIP
+    - description: The effective SNAT IP address for the selected workloads.
+      jsonPath: .status.egressIP
       name: EgressIP
       type: string
     - jsonPath: .metadata.creationTimestamp

diff --git a/build/yamls/antrea-crds.yml b/build/yamls/antrea-crds.yml
@@ -1074,11 +1074,17 @@ spec:
             type: object
             required:
             - appliedTo
-            anyOf:
-            - required:
-              - egressIP
-            - required:
-              - externalIPPool
+            oneOf:
+            - anyOf:
+              - required:
+                - egressIP
+              - required:
+                - externalIPPool
+            - anyOf:
+              - required:
+                - egressIPs
+              - required:
+                - externalIPPools
             properties:
               appliedTo:
                 type: object
@@ -1136,16 +1142,30 @@ spec:
                 oneOf:
                 - format: ipv4
                 - format: ipv6
+              egressIPs:
+                type: array
+                items:
+                  type: string
+                  oneOf:
+                  - maxLength: 0
+                  - format: ipv4
+                  - format: ipv6
               externalIPPool:
                 type: string
+              externalIPPools:
+                type: array
+                items:
+                  type: string
           status:
             type: object
             properties:
               egressNode:
                 type: string
+              egressIP:
+                type: string
     additionalPrinterColumns:
-    - description: Specifies the SNAT IP address for the selected workloads.
-      jsonPath: .spec.egressIP
+    - description: The effective SNAT IP address for the selected workloads.
+      jsonPath: .status.egressIP
       name: EgressIP
       type: string
     - jsonPath: .metadata.creationTimestamp

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -1083,11 +1083,17 @@ spec:
             type: object
             required:
             - appliedTo
-            anyOf:
-            - required:
-              - egressIP
-            - required:
-              - externalIPPool
+            oneOf:
+            - anyOf:
+              - required:
+                - egressIP
+              - required:
+                - externalIPPool
+            - anyOf:
+              - required:
+                - egressIPs
+              - required:
+                - externalIPPools
             properties:
               appliedTo:
                 type: object
@@ -1145,16 +1151,30 @@ spec:
                 oneOf:
                 - format: ipv4
                 - format: ipv6
+              egressIPs:
+                type: array
+                items:
+                  type: string
+                  oneOf:
+                  - maxLength: 0
+                  - format: ipv4
+                  - format: ipv6
               externalIPPool:
                 type: string
+              externalIPPools:
+                type: array
+                items:
+                  type: string
           status:
             type: object
             properties:
               egressNode:
                 type: string
+              egressIP:
+                type: string
     additionalPrinterColumns:
-    - description: Specifies the SNAT IP address for the selected workloads.
-      jsonPath: .spec.egressIP
+    - description: The effective SNAT IP address for the selected workloads.
+      jsonPath: .status.egressIP
       name: EgressIP
       type: string
     - jsonPath: .metadata.creationTimestamp

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -1083,11 +1083,17 @@ spec:
             type: object
             required:
             - appliedTo
-            anyOf:
-            - required:
-              - egressIP
-            - required:
-              - externalIPPool
+            oneOf:
+            - anyOf:
+              - required:
+                - egressIP
+              - required:
+                - externalIPPool
+            - anyOf:
+              - required:
+                - egressIPs
+              - required:
+                - externalIPPools
             properties:
               appliedTo:
                 type: object
@@ -1145,16 +1151,30 @@ spec:
                 oneOf:
                 - format: ipv4
                 - format: ipv6
+              egressIPs:
+                type: array
+                items:
+                  type: string
+                  oneOf:
+                  - maxLength: 0
+                  - format: ipv4
+                  - format: ipv6
               externalIPPool:
                 type: string
+              externalIPPools:
+                type: array
+                items:
+                  type: string
           status:
             type: object
             properties:
               egressNode:
                 type: string
+              egressIP:
+                type: string
     additionalPrinterColumns:
-    - description: Specifies the SNAT IP address for the selected workloads.
-      jsonPath: .spec.egressIP
+    - description: The effective SNAT IP address for the selected workloads.
+      jsonPath: .status.egressIP
       name: EgressIP
       type: string
     - jsonPath: .metadata.creationTimestamp

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -1083,11 +1083,17 @@ spec:
             type: object
             required:
             - appliedTo
-            anyOf:
-            - required:
-              - egressIP
-            - required:
-              - externalIPPool
+            oneOf:
+            - anyOf:
+              - required:
+                - egressIP
+              - required:
+                - externalIPPool
+            - anyOf:
+              - required:
+                - egressIPs
+              - required:
+                - externalIPPools
             properties:
               appliedTo:
                 type: object
@@ -1145,16 +1151,30 @@ spec:
                 oneOf:
                 - format: ipv4
                 - format: ipv6
+              egressIPs:
+                type: array
+                items:
+                  type: string
+                  oneOf:
+                  - maxLength: 0
+                  - format: ipv4
+                  - format: ipv6
               externalIPPool:
                 type: string
+              externalIPPools:
+                type: array
+                items:
+                  type: string
           status:
             type: object
             properties:
               egressNode:
                 type: string
+              egressIP:
+                type: string
     additionalPrinterColumns:
-    - description: Specifies the SNAT IP address for the selected workloads.
-      jsonPath: .spec.egressIP
+    - description: The effective SNAT IP address for the selected workloads.
+      jsonPath: .status.egressIP
       name: EgressIP
       type: string
     - jsonPath: .metadata.creationTimestamp

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -1083,11 +1083,17 @@ spec:
             type: object
             required:
             - appliedTo
-            anyOf:
-            - required:
-              - egressIP
-            - required:
-              - externalIPPool
+            oneOf:
+            - anyOf:
+              - required:
+                - egressIP
+              - required:
+                - externalIPPool
+            - anyOf:
+              - required:
+                - egressIPs
+              - required:
+                - externalIPPools
             properties:
               appliedTo:
                 type: object
@@ -1145,16 +1151,30 @@ spec:
                 oneOf:
                 - format: ipv4
                 - format: ipv6
+              egressIPs:
+                type: array
+                items:
+                  type: string
+                  oneOf:
+                  - maxLength: 0
+                  - format: ipv4
+                  - format: ipv6
               externalIPPool:
                 type: string
+              externalIPPools:
+                type: array
+                items:
+                  type: string
           status:
             type: object
             properties:
               egressNode:
                 type: string
+              egressIP:
+                type: string
     additionalPrinterColumns:
-    - description: Specifies the SNAT IP address for the selected workloads.
-      jsonPath: .spec.egressIP
+    - description: The effective SNAT IP address for the selected workloads.
+      jsonPath: .status.egressIP
       name: EgressIP
       type: string
     - jsonPath: .metadata.creationTimestamp