Add same-labels e2e testcase

Signed-off-by: Dyanngg <dingyang@vmware.com>
antrea-io · Jan 10, 2023 · 9eb0b92 · 9eb0b92
1 parent cdf7892
commit 9eb0b92
Show file tree

Hide file tree

Showing 8 changed files with 296 additions and 40 deletions.
diff --git a/multicluster/build/yamls/antrea-multicluster-leader-global.yml b/multicluster/build/yamls/antrea-multicluster-leader-global.yml
@@ -935,9 +935,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -1315,9 +1323,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -1823,9 +1839,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -2203,9 +2227,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -3627,9 +3659,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -4007,9 +4047,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -4515,9 +4563,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -4895,9 +4951,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the

diff --git a/multicluster/build/yamls/antrea-multicluster-leader-namespaced.yml b/multicluster/build/yamls/antrea-multicluster-leader-namespaced.yml
@@ -366,7 +366,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 7eb0f1e65f7eb3e35b0739d6064b92b7621af0f4e41813c35bfdee71ceaefbe2
+        checksum/config: 
       labels:
         app: antrea
         component: antrea-mc-controller

diff --git a/multicluster/build/yamls/antrea-multicluster-member.yml b/multicluster/build/yamls/antrea-multicluster-member.yml
@@ -1090,7 +1090,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 7eb0f1e65f7eb3e35b0739d6064b92b7621af0f4e41813c35bfdee71ceaefbe2
+        checksum/config: 
       labels:
         app: antrea
         component: antrea-mc-controller

diff --git a/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceexports.yaml b/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceexports.yaml
@@ -630,9 +630,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -1010,9 +1018,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -1518,9 +1534,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -1898,9 +1922,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the

diff --git a/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceimports.yaml b/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceimports.yaml
@@ -628,9 +628,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -1008,9 +1016,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -1516,9 +1532,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the
@@ -1896,9 +1920,17 @@ spec:
                                   ingress/egress rules. Cannot be set with NamespaceSelector.'
                                 properties:
                                   match:
-                                    description: NamespaceMatchType describes Namespace
-                                      matching strategy.
+                                    description: Selects from the same Namespace of
+                                      the appliedTo workloads.
                                     type: string
+                                  sameLabels:
+                                    description: Selects Namespaces that share the
+                                      same values for the given set of label keys
+                                      with the appliedTo Namespace. Namespaces must
+                                      have all the label keys.
+                                    items:
+                                      type: string
+                                    type: array
                                 type: object
                               nodeSelector:
                                 description: Select certain Nodes which match the