add namespaceSelector field in subnet

Signed-off-by: 马洪贞 <[email protected]>
kubeovn · Sep 13, 2024 · a1765d0 · a1765d0
1 parent 2b24b2b
commit a1765d0
Show file tree

Hide file tree

Showing 68 changed files with 3,529 additions and 734 deletions.
diff --git a/charts/kube-ovn/templates/kube-ovn-crd.yaml b/charts/kube-ovn/templates/kube-ovn-crd.yaml
@@ -2041,6 +2041,28 @@ spec:
                             type: string
                           dstIPs:
                             type: string
+                namespaceSelector:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      matchLabels:
+                        type: object
+                        additionalProperties:
+                          type: string
+                      matchExpressions:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            key:
+                              type: string
+                            operator:
+                              type: string
+                            values:
+                              type: array
+                              items:
+                                type: string
                 conditions:
                   type: array
                   items:
@@ -2194,6 +2216,28 @@ spec:
                   type: boolean
                 routeTable:
                   type: string
+                namespaceSelector:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      matchLabels:
+                        type: object
+                        additionalProperties:
+                          type: string
+                      matchExpressions:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            key:
+                              type: string
+                            operator:
+                              type: string
+                            values:
+                              type: array
+                              items:
+                                type: string
   scope: Cluster
   names:
     plural: subnets

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -2289,6 +2289,28 @@ spec:
                             type: string
                           dstIPs:
                             type: string
+                namespaceSelector:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      matchLabels:
+                        type: object
+                        additionalProperties:
+                          type: string
+                      matchExpressions:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            key:
+                              type: string
+                            operator:
+                              type: string
+                            values:
+                              type: array
+                              items:
+                                type: string
                 conditions:
                   type: array
                   items:
@@ -2442,6 +2464,28 @@ spec:
                   type: boolean
                 routeTable:
                   type: string
+                namespaceSelector:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      matchLabels:
+                        type: object
+                        additionalProperties:
+                          type: string
+                      matchExpressions:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            key:
+                              type: string
+                            operator:
+                              type: string
+                            values:
+                              type: array
+                              items:
+                                type: string
   scope: Cluster
   names:
     plural: subnets

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -170,7 +170,8 @@ type SubnetSpec struct {
 	EnableEcmp           bool   `json:"enableEcmp,omitempty"`
 	EnableMulticastSnoop bool   `json:"enableMulticastSnoop,omitempty"`
 
-	RouteTable string `json:"routeTable,omitempty"`
+	RouteTable        string                 `json:"routeTable,omitempty"`
+	NamespaceSelector []metav1.LabelSelector `json:"namespaceSelector,omitempty"`
 }
 
 type ACL struct {
@@ -247,6 +248,7 @@ type SubnetStatus struct {
 	NatOutgoingPolicyRules []NatOutgoingPolicyRuleStatus `json:"natOutgoingPolicyRules"`
 	McastQuerierIP         string                        `json:"mcastQuerierIP"`
 	McastQuerierMAC        string                        `json:"mcastQuerierMAC"`
+	NamespaceSelector      []metav1.LabelSelector        `json:"namespaceSelector"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go b/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/client/clientset/versioned/typed/kubeovn/v1/fake/fake_ip.go b/pkg/client/clientset/versioned/typed/kubeovn/v1/fake/fake_ip.go
diff --git a/pkg/client/clientset/versioned/typed/kubeovn/v1/fake/fake_ippool.go b/pkg/client/clientset/versioned/typed/kubeovn/v1/fake/fake_ippool.go