Address comment

antrea-io · May 11, 2021 · b5eab04 · b5eab04
1 parent 629f2c8
commit b5eab04
Show file tree

Hide file tree

Showing 7 changed files with 688 additions and 274 deletions.
diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -117,7 +117,9 @@ spec:
           spec:
             properties:
               childGroups:
-                x-kubernetes-preserve-unknown-fields: true
+                items:
+                  type: string
+                type: array
               externalEntitySelector:
                 properties:
                   matchExpressions:
@@ -225,17 +227,76 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
-  - name: v1alpha3
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    app: antrea
+  name: clustergroups.crd.antrea.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: antrea
+          namespace: kube-system
+          path: /convert/clustergroup
+      conversionReviewVersions:
+      - v1
+      - v1beta1
+  group: crd.antrea.io
+  names:
+    kind: ClusterGroup
+    plural: clustergroups
+    shortNames:
+    - cg
+    singular: group
+  scope: Cluster
+  versions:
+  - name: v1alpha2
     schema:
       openAPIV3Schema:
         properties:
           spec:
             properties:
               childGroups:
-                x-kubernetes-preserve-unknown-fields: true
+                items:
+                  type: string
+                type: array
               externalEntitySelector:
-                x-kubernetes-preserve-unknown-fields: true
+                properties:
+                  matchExpressions:
+                    items:
+                      properties:
+                        key:
+                          type: string
+                        operator:
+                          enum:
+                          - In
+                          - NotIn
+                          - Exists
+                          - DoesNotExist
+                          type: string
+                        values:
+                          items:
+                            type: string
+                          type: array
+                      type: object
+                    type: array
+                  matchLabels:
+                    x-kubernetes-preserve-unknown-fields: true
+                type: object
+              ipBlock:
+                properties:
+                  cidr:
+                    format: cidr
+                    type: string
+                type: object
               ipBlocks:
                 items:
                   properties:
@@ -245,9 +306,51 @@ spec:
                   type: object
                 type: array
               namespaceSelector:
-                x-kubernetes-preserve-unknown-fields: true
+                properties:
+                  matchExpressions:
+                    items:
+                      properties:
+                        key:
+                          type: string
+                        operator:
+                          enum:
+                          - In
+                          - NotIn
+                          - Exists
+                          - DoesNotExist
+                          type: string
+                        values:
+                          items:
+                            type: string
+                          type: array
+                      type: object
+                    type: array
+                  matchLabels:
+                    x-kubernetes-preserve-unknown-fields: true
+                type: object
               podSelector:
-                x-kubernetes-preserve-unknown-fields: true
+                properties:
+                  matchExpressions:
+                    items:
+                      properties:
+                        key:
+                          type: string
+                        operator:
+                          enum:
+                          - In
+                          - NotIn
+                          - Exists
+                          - DoesNotExist
+                          type: string
+                        values:
+                          items:
+                            type: string
+                          type: array
+                      type: object
+                    type: array
+                  matchLabels:
+                    x-kubernetes-preserve-unknown-fields: true
+                type: object
               serviceReference:
                 properties:
                   name:
@@ -272,45 +375,17 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
-    subresources:
-      status: {}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  labels:
-    app: antrea
-  name: clustergroups.crd.antrea.io
-spec:
-  conversion:
-    strategy: Webhook
-    webhook:
-      clientConfig:
-        service:
-          name: antrea
-          namespace: kube-system
-          path: /convert/clustergroup
-      conversionReviewVersions:
-      - v1
-      - v1beta1
-  group: crd.antrea.io
-  names:
-    kind: ClusterGroup
-    plural: clustergroups
-    shortNames:
-    - cg
-    singular: group
-  scope: Cluster
-  versions:
-  - name: v1alpha2
+    storage: false
+  - name: v1alpha3
     schema:
       openAPIV3Schema:
         properties:
           spec:
             properties:
               childGroups:
-                x-kubernetes-preserve-unknown-fields: true
+                items:
+                  type: string
+                type: array
               externalEntitySelector:
                 properties:
                   matchExpressions:
@@ -334,12 +409,6 @@ spec:
                   matchLabels:
                     x-kubernetes-preserve-unknown-fields: true
                 type: object
-              ipBlock:
-                properties:
-                  cidr:
-                    format: cidr
-                    type: string
-                type: object
               ipBlocks:
                 items:
                   properties:
@@ -3059,13 +3128,6 @@ rules:
   - subjectaccessreviews
   verbs:
   - create
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - customresourcedefinitions
-  verbs:
-  - get
-  - update
 - apiGroups:
   - ""
   resourceNames:
@@ -3163,6 +3225,13 @@ rules:
   - subjectaccessreviews
   verbs:
   - create
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - get
+  - update
 - apiGroups:
   - ""
   resourceNames: