Address comments

Signed-off-by: Dyanngg <[email protected]>
antrea-io · Mar 1, 2024 · d4511e2 · d4511e2
1 parent 21d7ac5
commit d4511e2
Show file tree

Hide file tree

Showing 15 changed files with 785 additions and 500 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,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    sameLabels:
+                                      type: array
+                                      items:
+                                        type: string
                             ipBlock:
                               type: object
                               properties:
@@ -1360,11 +1360,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    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,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    sameLabels:
+                                      type: array
+                                      items:
+                                        type: string
                             ipBlock:
                               type: object
                               properties:
@@ -2057,11 +2057,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    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,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    sameLabels:
+                                      type: array
+                                      items:
+                                        type: string
                             ipBlock:
                               type: object
                               properties:
@@ -2050,11 +2050,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    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,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    sameLabels:
+                                      type: array
+                                      items:
+                                        type: string
                             ipBlock:
                               type: object
                               properties:
@@ -2057,11 +2057,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    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,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    sameLabels:
+                                      type: array
+                                      items:
+                                        type: string
                             ipBlock:
                               type: object
                               properties:
@@ -2057,11 +2057,19 @@ spec:
                                   type: object
                             namespaces:
                               type: object
-                              properties:
-                                match:
-                                  enum:
-                                    - Self
-                                  type: string
+                              oneOf:
+                                - type: object
+                                  properties:
+                                    match:
+                                      type: string
+                                      enum:
+                                        - Self
+                                - type: object
+                                  properties:
+                                    sameLabels:
+                                      type: array
+                                      items:
+                                        type: string
                             ipBlock:
                               type: object
                               properties: