feat: in vlan mode if physical gateway exists, no need to create a vi…

…rtual one
kubeovn · May 20, 2020 · 6c89a04 · 6c89a04
1 parent d13e945
commit 6c89a04
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 19 deletions.
diff --git a/docs/vlan.md b/docs/vlan.md
@@ -59,6 +59,7 @@ spec:
   gatewayType: distributed
   natOutgoing: true
   vlan: product
+  underlayGateway: true # If the gateway exist in physical switch please set underlayGateway to true, otherwise kube-ovn will create a virtual one
   namespaces:
     - product
 ```

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -88,7 +88,8 @@ type SubnetSpec struct {
 	Private      bool     `json:"private"`
 	AllowSubnets []string `json:"allowSubnets,omitempty"`
 
-	Vlan string `json:"vlan,omitempty"`
+	Vlan            string `json:"vlan,omitempty"`
+	UnderlayGateway bool   `json:"underlayGateway"`
 }
 
 // ConditionType encodes information on the condition

diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -439,19 +439,21 @@ func (c *Controller) handleUpdatePod(key string) error {
 		return err
 	}
 
-	if subnet.Spec.GatewayType == kubeovnv1.GWDistributedType {
-		node, err := c.nodesLister.Get(pod.Spec.NodeName)
-		if err != nil {
-			klog.Errorf("get node %s failed %v", pod.Spec.NodeName, err)
-			return err
-		}
-		nodeTunlIPAddr, err := getNodeTunlIP(node)
-		if err != nil {
-			return err
-		}
+	if !subnet.Spec.UnderlayGateway {
+		if subnet.Spec.GatewayType == kubeovnv1.GWDistributedType {
+			node, err := c.nodesLister.Get(pod.Spec.NodeName)
+			if err != nil {
+				klog.Errorf("get node %s failed %v", pod.Spec.NodeName, err)
+				return err
+			}
+			nodeTunlIPAddr, err := getNodeTunlIP(node)
+			if err != nil {
+				return err
+			}
 
-		if err := c.ovnClient.AddStaticRoute(ovs.PolicySrcIP, podIP, nodeTunlIPAddr.String(), c.config.ClusterRouter); err != nil {
-			return errors.Annotate(err, "add static route failed")
+			if err := c.ovnClient.AddStaticRoute(ovs.PolicySrcIP, podIP, nodeTunlIPAddr.String(), c.config.ClusterRouter); err != nil {
+				return errors.Annotate(err, "add static route failed")
+			}
 		}
 	}
 

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -424,7 +424,7 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 	if !exist {
 		subnet.Status.EnsureStandardConditions()
 		// If multiple namespace use same ls name, only first one will success
-		if err := c.ovnClient.CreateLogicalSwitch(subnet.Name, subnet.Spec.Protocol, subnet.Spec.CIDRBlock, subnet.Spec.Gateway, subnet.Spec.ExcludeIps); err != nil {
+		if err := c.ovnClient.CreateLogicalSwitch(subnet.Name, subnet.Spec.Protocol, subnet.Spec.CIDRBlock, subnet.Spec.Gateway, subnet.Spec.ExcludeIps, subnet.Spec.UnderlayGateway); err != nil {
 			c.patchSubnetStatus(subnet, "CreateLogicalSwitchFailed", err.Error())
 			return err
 		}

diff --git a/pkg/daemon/controller.go b/pkg/daemon/controller.go
@@ -174,7 +174,7 @@ func (c *Controller) reconcileRouters() error {
 	}
 	cidrs := make([]string, 0, len(subnets))
 	for _, subnet := range subnets {
-		if !subnet.Status.IsReady() {
+		if !subnet.Status.IsReady() || subnet.Spec.UnderlayGateway {
 			continue
 		}
 		if _, ipNet, err := net.ParseCIDR(subnet.Spec.CIDRBlock); err != nil {

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -82,7 +82,7 @@ func (c Client) SetLogicalSwitchConfig(ls, protocol, subnet, gateway string, exc
 }
 
 // CreateLogicalSwitch create logical switch in ovn, connect it to router and apply tcp/udp lb rules
-func (c Client) CreateLogicalSwitch(ls, protocol, subnet, gateway string, excludeIps []string) error {
+func (c Client) CreateLogicalSwitch(ls, protocol, subnet, gateway string, excludeIps []string, underlayGateway bool) error {
 	var err error
 	switch protocol {
 	case kubeovnv1.ProtocolIPv4:
@@ -107,9 +107,11 @@ func (c Client) CreateLogicalSwitch(ls, protocol, subnet, gateway string, exclud
 	mac := util.GenerateMac()
 	mask := strings.Split(subnet, "/")[1]
 	klog.Infof("create route port for switch %s", ls)
-	if err := c.createRouterPort(ls, c.ClusterRouter, gateway+"/"+mask, mac); err != nil {
-		klog.Errorf("failed to connect switch %s to router, %v", ls, err)
-		return err
+	if !underlayGateway {
+		if err := c.createRouterPort(ls, c.ClusterRouter, gateway+"/"+mask, mac); err != nil {
+			klog.Errorf("failed to connect switch %s to router, %v", ls, err)
+			return err
+		}
 	}
 	if ls != c.NodeSwitch {
 		// DO NOT add ovn dns/lb to node switch