Support SameLabels as peer Namespace selection in ACNP

Signed-off-by: Dyanngg <[email protected]>
antrea-io · Jan 3, 2023 · 6c6f020 · 6c6f020
1 parent 00f59cd
commit 6c6f020
Show file tree

Hide file tree

Showing 11 changed files with 377 additions and 35 deletions.
diff --git a/build/charts/antrea/crds/clusternetworkpolicy.yaml b/build/charts/antrea/crds/clusternetworkpolicy.yaml
@@ -334,6 +334,10 @@ spec:
                                   enum:
                                     - Self
                                   type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -582,6 +586,10 @@ spec:
                                   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
@@ -712,6 +712,10 @@ spec:
                                   enum:
                                     - Self
                                   type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -960,6 +964,10 @@ spec:
                                   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
@@ -705,6 +705,10 @@ spec:
                                   enum:
                                     - Self
                                   type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -953,6 +957,10 @@ spec:
                                   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
@@ -712,6 +712,10 @@ spec:
                                   enum:
                                     - Self
                                   type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -960,6 +964,10 @@ spec:
                                   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
@@ -712,6 +712,10 @@ spec:
                                   enum:
                                     - Self
                                   type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -960,6 +964,10 @@ spec:
                                   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
@@ -712,6 +712,10 @@ spec:
                                   enum:
                                     - Self
                                   type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -960,6 +964,10 @@ spec:
                                   enum:
                                     - Self
                                   type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -712,6 +712,10 @@ spec:
                                   enum:
                                     - Self
                                   type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:
@@ -960,6 +964,10 @@ spec:
                                   enum:
                                     - Self
                                   type: string
+                                sameLabels:
+                                  type: array
+                                  items:
+                                    type: string
                             ipBlock:
                               type: object
                               properties:

diff --git a/pkg/apis/crd/v1alpha1/types.go b/pkg/apis/crd/v1alpha1/types.go
@@ -542,8 +542,14 @@ type AppliedTo struct {
 	Service *NamespacedName `json:"service,omitempty"`
 }
 
+// PeerNamespaces describes criteria for selecting Pod/ExternalEntity
+// from matched Namespaces. Only one of the criteria can be set.
 type PeerNamespaces struct {
+	// Selects from the same Namespace of the appliedTo workloads.
 	Match NamespaceMatchType `json:"match,omitempty"`
+	// 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.
+	SameLabels []string `json:"sameLabels,omitempty"`
 }
 
 // NamespaceMatchType describes Namespace matching strategy.

diff --git a/pkg/apis/crd/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/crd/v1alpha1/zz_generated.deepcopy.go