feat: allow setting default subnet for custom vpc (#4171)

* feat: allow setting default subnet for custom vpc Signed-off-by: Karol Szwaj <[email protected]> * set default subnet in custom vpc Signed-off-by: Karol Szwaj <[email protected]> * add ns annotation to enable default pod subnet in custom vpc Signed-off-by: Karol Szwaj <[email protected]> * update crd Signed-off-by: Karol Szwaj <[email protected]> * fix ns check Signed-off-by: Karol Szwaj <[email protected]> * fix namespace condition Signed-off-by: Karol Szwaj <[email protected]> * review update Signed-off-by: Karol Szwaj <[email protected]> * review update Signed-off-by: Karol Szwaj <[email protected]> * reuse logical_switch namespace annotation instead introducing a new one Signed-off-by: Karol Szwaj <[email protected]> * add comment Signed-off-by: Karol Szwaj <[email protected]> * reuse defaultLogicalSwitch status field instead of new one Signed-off-by: Karol Szwaj <[email protected]> --------- Signed-off-by: Karol Szwaj <[email protected]>
kubeovn · Aug 23, 2024 · 6f669c7 · 6f669c7
1 parent c1a367b
commit 6f669c7
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 7 deletions.
diff --git a/charts/kube-ovn/templates/kube-ovn-crd.yaml b/charts/kube-ovn/templates/kube-ovn-crd.yaml
@@ -1603,12 +1603,17 @@ spec:
         - jsonPath: .spec.namespaces
           name: Namespaces
           type: string
+        - jsonPath: .status.defaultLogicalSwitch
+          name: DefaultSubnet
+          type: string
       name: v1
       schema:
         openAPIV3Schema:
           properties:
             spec:
               properties:
+                defaultSubnet:
+                  type: string
                 enableExternal:
                   type: boolean
                 enableBfd:

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1846,12 +1846,17 @@ spec:
         - jsonPath: .spec.namespaces
           name: Namespaces
           type: string
+        - jsonPath: .status.defaultLogicalSwitch
+          name: DefaultSubnet
+          type: string
       name: v1
       schema:
         openAPIV3Schema:
           properties:
             spec:
               properties:
+                defaultSubnet:
+                  type: string
                 enableExternal:
                   type: boolean
                 enableBfd:
@@ -3144,11 +3149,11 @@ rules:
       - subjectaccessreviews
     verbs:
       - create
-  - apiGroups: 
+  - apiGroups:
       - "certificates.k8s.io"
-    resources: 
+    resources:
       - "certificatesigningrequests"
-    verbs: 
+    verbs:
       - "get"
       - "list"
       - "watch"
@@ -3277,12 +3282,12 @@ rules:
       - subjectaccessreviews
     verbs:
       - create
-  - apiGroups: 
+  - apiGroups:
       - "certificates.k8s.io"
-    resources: 
+    resources:
       - "certificatesigningrequests"
-    verbs: 
-      - "create" 
+    verbs:
+      - "create"
       - "get"
       - "list"
       - "watch"

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -418,6 +418,7 @@ type Vpc struct {
 }
 
 type VpcSpec struct {
+	DefaultSubnet        string         `json:"defaultSubnet,omitempty"`
 	Namespaces           []string       `json:"namespaces,omitempty"`
 	StaticRoutes         []*StaticRoute `json:"staticRoutes,omitempty"`
 	PolicyRoutes         []*PolicyRoute `json:"policyRoutes,omitempty"`

diff --git a/pkg/controller/namespace.go b/pkg/controller/namespace.go
@@ -114,6 +114,17 @@ func (c *Controller) handleAddNamespace(key string) error {
 				break
 			}
 		}
+		// check if subnet is in custom vpc with configured defaultSubnet, then annotate the namespace with this subnet
+		if s.Spec.Vpc != "" && s.Spec.Vpc != c.config.ClusterRouter {
+			vpc, err := c.vpcsLister.Get(s.Spec.Vpc)
+			if err != nil {
+				klog.Errorf("failed to get custom vpc %v", err)
+				return err
+			}
+			if s.Name == vpc.Spec.DefaultSubnet {
+				lss = []string{s.Name}
+			}
+		}
 	}
 
 	for _, p := range ippools {

diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go
@@ -959,6 +959,10 @@ func (c *Controller) getVpcSubnets(vpc *kubeovnv1.Vpc) (subnets []string, defaul
 		if subnet.Spec.Default {
 			defaultSubnet = subnet.Name
 		}
+
+		if vpc.Name != util.DefaultVpc && vpc.Spec.DefaultSubnet != "" && vpc.Spec.DefaultSubnet == subnet.Name {
+			defaultSubnet = vpc.Spec.DefaultSubnet
+		}
 	}
 	return
 }