support vpc configuration of multiple external network segments throu…

…gh label and crd (#3264) * add externalSubnet field support for vpc * custom vpc get chassis from node label * custom vpc add external based on ExternalSubnets * support externalsubnets update * compatible with default external * fix custom vpc default external localnet create * update addExternalSubnets status * crd for addExternalSubnets * add additionalPrinterColumn extraExternalSubnets --------- Signed-off-by: zcq98 <zhaocongqi_yewu@cmss.chinamobile.com>
kubeovn · Oct 18, 2023 · 418d45f · 418d45f
1 parent 5198037
commit 418d45f
Show file tree

Hide file tree

Showing 6 changed files with 193 additions and 69 deletions.
diff --git a/charts/templates/kube-ovn-crd.yaml b/charts/templates/kube-ovn-crd.yaml
@@ -1209,6 +1209,9 @@ spec:
         - jsonPath: .status.subnets
           name: Subnets
           type: string
+        - jsonPath: .status.extraExternalSubnets
+          name: ExtraExternalSubnets
+          type: string
         - jsonPath: .spec.namespaces
           name: Namespaces
           type: string
@@ -1226,6 +1229,10 @@ spec:
                   items:
                     type: string
                   type: array
+                extraExternalSubnets:
+                  items:
+                    type: string
+                  type: array
                 staticRoutes:
                   items:
                     properties:
@@ -1301,6 +1308,10 @@ spec:
                   items:
                     type: string
                   type: array
+                extraExternalSubnets:
+                  items:
+                    type: string
+                  type: array
                 vpcPeerings:
                   items:
                     type: string

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1748,6 +1748,9 @@ spec:
         - jsonPath: .status.subnets
           name: Subnets
           type: string
+        - jsonPath: .status.extraExternalSubnets
+          name: ExtraExternalSubnets
+          type: string
         - jsonPath: .spec.namespaces
           name: Namespaces
           type: string
@@ -1765,6 +1768,10 @@ spec:
                   items:
                     type: string
                   type: array
+                extraExternalSubnets:
+                  items:
+                    type: string
+                  type: array
                 staticRoutes:
                   items:
                     properties:
@@ -1840,6 +1847,10 @@ spec:
                   items:
                     type: string
                   type: array
+                extraExternalSubnets:
+                  items:
+                    type: string
+                  type: array
                 vpcPeerings:
                   items:
                     type: string

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -414,12 +414,13 @@ type Vpc struct {
 }
 
 type VpcSpec struct {
-	Namespaces     []string       `json:"namespaces,omitempty"`
-	StaticRoutes   []*StaticRoute `json:"staticRoutes,omitempty"`
-	PolicyRoutes   []*PolicyRoute `json:"policyRoutes,omitempty"`
-	VpcPeerings    []*VpcPeering  `json:"vpcPeerings,omitempty"`
-	EnableExternal bool           `json:"enableExternal,omitempty"`
-	EnableBfd      bool           `json:"enableBfd,omitempty"`
+	Namespaces           []string       `json:"namespaces,omitempty"`
+	StaticRoutes         []*StaticRoute `json:"staticRoutes,omitempty"`
+	PolicyRoutes         []*PolicyRoute `json:"policyRoutes,omitempty"`
+	VpcPeerings          []*VpcPeering  `json:"vpcPeerings,omitempty"`
+	EnableExternal       bool           `json:"enableExternal,omitempty"`
+	ExtraExternalSubnets []string       `json:"extraExternalSubnets,omitempty"`
+	EnableBfd            bool           `json:"enableBfd,omitempty"`
 }
 
 type VpcPeering struct {
@@ -480,6 +481,7 @@ type VpcStatus struct {
 	Subnets                 []string `json:"subnets"`
 	VpcPeerings             []string `json:"vpcPeerings"`
 	EnableExternal          bool     `json:"enableExternal"`
+	ExtraExternalSubnets    []string `json:"extraExternalSubnets"`
 	EnableBfd               bool     `json:"enableBfd"`
 }
 

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -1860,12 +1860,6 @@ func (c *Controller) reconcileVlan(subnet *kubeovnv1.Subnet) error {
 		return nil
 	}
 	klog.Infof("reconcile vlan %v", subnet.Spec.Vlan)
-	isExternalGatewaySwitch := !subnet.Spec.LogicalGateway && subnet.Name == c.config.ExternalGatewaySwitch
-	if isExternalGatewaySwitch {
-		// external gw deal this vlan subnet, just skip
-		klog.Infof("skip reconcile vlan subnet %s", c.config.ExternalGatewaySwitch)
-		return nil
-	}
 
 	vlan, err := c.vlansLister.Get(subnet.Spec.Vlan)
 	if err != nil {