From 3a4347b92b343cc9fbc0bd8f841213b681cca9c9 Mon Sep 17 00:00:00 2001
From: zhangzujian <zhangzujian.7@gmail.com>
Date: Wed, 9 Jun 2021 18:18:26 +0800
Subject: [PATCH] set default UnderlayGateway to true in vlan mode

---
 pkg/controller/init.go   | 4 +---
 pkg/controller/subnet.go | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkg/controller/init.go b/pkg/controller/init.go
index ba8ea2d5836..978cb073039 100644
--- a/pkg/controller/init.go
+++ b/pkg/controller/init.go
@@ -115,9 +115,7 @@ func (c *Controller) initDefaultLogicalSwitch() error {
 	}
 	if c.config.NetworkType == util.NetworkTypeVlan {
 		defaultSubnet.Spec.Vlan = c.config.DefaultVlanName
-		if c.config.DefaultVlanID == 0 {
-			defaultSubnet.Spec.UnderlayGateway = true
-		}
+		defaultSubnet.Spec.UnderlayGateway = true
 	}
 
 	_, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &defaultSubnet, metav1.CreateOptions{})
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
index a386786225f..b9fa84a6017 100644
--- a/pkg/controller/subnet.go
+++ b/pkg/controller/subnet.go
@@ -260,11 +260,9 @@ func formatSubnet(subnet *kubeovnv1.Subnet, c *Controller) error {
 		if subnet.Spec.Default && subnet.Name != c.config.DefaultLogicalSwitch {
 			subnet.Spec.Default = false
 		}
-		if util.IsNetworkVlan(c.config.NetworkType) && subnet.Spec.Vlan == "" {
+		if c.config.NetworkType == util.NetworkTypeVlan && subnet.Spec.Vlan == "" {
 			subnet.Spec.Vlan = c.config.DefaultVlanName
-			if c.config.DefaultVlanID == 0 {
-				subnet.Spec.UnderlayGateway = true
-			}
+			subnet.Spec.UnderlayGateway = true
 		}
 		if subnet.Spec.Vlan != "" {
 			if _, err := c.vlansLister.Get(subnet.Spec.Vlan); err != nil {