Address comments

Signed-off-by: Dyanngg <dingyang@vmware.com>
antrea-io · Mar 2, 2024 · 70eccc8 · 70eccc8
1 parent 21d7ac5
commit 70eccc8
Show file tree

Hide file tree

Showing 15 changed files with 700 additions and 446 deletions.
diff --git a/build/charts/antrea/crds/clusternetworkpolicy.yaml b/build/charts/antrea/crds/clusternetworkpolicy.yaml
@@ -344,10 +344,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -609,10 +605,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1084,11 +1076,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1360,11 +1358,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -1041,10 +1041,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1306,10 +1302,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1781,11 +1773,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -2057,11 +2055,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:

diff --git a/build/yamls/antrea-crds.yml b/build/yamls/antrea-crds.yml
@@ -1034,10 +1034,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1299,10 +1295,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1774,11 +1766,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -2050,11 +2048,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -1041,10 +1041,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1306,10 +1302,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1781,11 +1773,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -2057,11 +2055,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -1041,10 +1041,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1306,10 +1302,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1781,11 +1773,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -2057,11 +2055,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -1041,10 +1041,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1306,10 +1302,6 @@ spec:
                                   enum:
                                     - Self
                                   type: string
-                                sameLabels:
-                                  type: array
-                                  items:
-                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1781,11 +1773,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -2057,11 +2055,17 @@ spec:
                                   type: object
                             namespaces:
                               type: object
+                              maxProperties: 1
+                              minProperties: 1
                               properties:
                                 match:
+                                  type: string
                                   enum:
                                     - Self
-                                  type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties: