Unify IPPool subnet and ExternalIPPool definitions

1. Make IPPoolSpec of IPPool use the same way to define IP ranges and subnet as ExternalIPPool. 2. Promote IPPool CRD to v1beta1 Issue:antrea-io#5961 Signed-off-by: Mengdie Song <[email protected]>
mengdie-song · Feb 29, 2024 · 5743613 · 5743613
1 parent d3a0e72
commit 5743613
Show file tree

Hide file tree

Showing 34 changed files with 2,125 additions and 228 deletions.
diff --git a/build/charts/antrea/crds/ippool.yaml b/build/charts/antrea/crds/ippool.yaml
@@ -9,7 +9,7 @@ spec:
   versions:
     - name: v1alpha2
       served: true
-      storage: true
+      storage: false
       schema:
         openAPIV3Schema:
           type: object
@@ -122,6 +122,124 @@ spec:
           type: date
       subresources:
         status: {}
+    - name: v1beta1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          required:
+            - spec
+          properties:
+            spec:
+              required:
+                - ipVersion
+                - ipRanges
+                - subnetInfo
+              type: object
+              properties:
+                ipVersion:
+                  type: integer
+                  enum: [ 4, 6 ]
+                ipRanges:
+                  items:
+                    oneOf:
+                      - required:
+                          - cidr
+                      - required:
+                          - start
+                          - end
+                    properties:
+                      cidr:
+                        format: cidr
+                        type: string
+                      start:
+                        oneOf:
+                          - format: ipv4
+                          - format: ipv6
+                        type: string
+                      end:
+                        oneOf:
+                          - format: ipv4
+                          - format: ipv6
+                        type: string
+                    type: object
+                  type: array
+                subnetInfo:
+                  type: object
+                  required:
+                    - gateway
+                    - prefixLength
+                  properties:
+                    gateway:
+                      type: string
+                      oneOf:
+                        - format: ipv4
+                        - format: ipv6
+                    prefixLength:
+                      type: integer
+                      minimum: 1
+                      maximum: 127
+                    vlan:
+                      type: integer
+                      minimum: 0
+                      maximum: 4094
+            status:
+              properties:
+                ipAddresses:
+                  items:
+                    properties:
+                      ipAddress:
+                        type: string
+                      owner:
+                        properties:
+                          pod:
+                            properties:
+                              name:
+                                type: string
+                              namespace:
+                                type: string
+                              containerID:
+                                type: string
+                              ifName:
+                                type: string
+                            type: object
+                          statefulSet:
+                            properties:
+                              name:
+                                type: string
+                              namespace:
+                                type: string
+                              index:
+                                type: integer
+                            type: object
+                        type: object
+                      phase:
+                        type: string
+                    type: object
+                  type: array
+                usage:
+                  properties:
+                    used:
+                      type: integer
+                    total:
+                      type: integer
+                  type: object
+              type: object
+      additionalPrinterColumns:
+        - description: The number of total IPs
+          jsonPath: .status.usage.total
+          name: Total
+          type: integer
+        - description: The number of allocated IPs
+          jsonPath: .status.usage.used
+          name: Used
+          type: integer
+        - jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+      subresources:
+        status: {}
   scope: Cluster
   names:
     plural: ippools

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -3042,7 +3042,7 @@ spec:
   versions:
     - name: v1alpha2
       served: true
-      storage: true
+      storage: false
       schema:
         openAPIV3Schema:
           type: object
@@ -3155,6 +3155,124 @@ spec:
           type: date
       subresources:
         status: {}
+    - name: v1beta1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          required:
+            - spec
+          properties:
+            spec:
+              required:
+                - ipVersion
+                - ipRanges
+                - subnetInfo
+              type: object
+              properties:
+                ipVersion:
+                  type: integer
+                  enum: [ 4, 6 ]
+                ipRanges:
+                  items:
+                    oneOf:
+                      - required:
+                          - cidr
+                      - required:
+                          - start
+                          - end
+                    properties:
+                      cidr:
+                        format: cidr
+                        type: string
+                      start:
+                        oneOf:
+                          - format: ipv4
+                          - format: ipv6
+                        type: string
+                      end:
+                        oneOf:
+                          - format: ipv4
+                          - format: ipv6
+                        type: string
+                    type: object
+                  type: array
+                subnetInfo:
+                  type: object
+                  required:
+                    - gateway
+                    - prefixLength
+                  properties:
+                    gateway:
+                      type: string
+                      oneOf:
+                        - format: ipv4
+                        - format: ipv6
+                    prefixLength:
+                      type: integer
+                      minimum: 1
+                      maximum: 127
+                    vlan:
+                      type: integer
+                      minimum: 0
+                      maximum: 4094
+            status:
+              properties:
+                ipAddresses:
+                  items:
+                    properties:
+                      ipAddress:
+                        type: string
+                      owner:
+                        properties:
+                          pod:
+                            properties:
+                              name:
+                                type: string
+                              namespace:
+                                type: string
+                              containerID:
+                                type: string
+                              ifName:
+                                type: string
+                            type: object
+                          statefulSet:
+                            properties:
+                              name:
+                                type: string
+                              namespace:
+                                type: string
+                              index:
+                                type: integer
+                            type: object
+                        type: object
+                      phase:
+                        type: string
+                    type: object
+                  type: array
+                usage:
+                  properties:
+                    used:
+                      type: integer
+                    total:
+                      type: integer
+                  type: object
+              type: object
+      additionalPrinterColumns:
+        - description: The number of total IPs
+          jsonPath: .status.usage.total
+          name: Total
+          type: integer
+        - description: The number of allocated IPs
+          jsonPath: .status.usage.used
+          name: Used
+          type: integer
+        - jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+      subresources:
+        status: {}
   scope: Cluster
   names:
     plural: ippools