fix: devault vpc lb/dns

kubeovn · Nov 4, 2020 · dd2234f · dd2234f
1 parent 32c49c1
commit dd2234f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -294,14 +294,14 @@ func (c *Controller) Run(stopCh <-chan struct{}) {
 		klog.Fatalf("failed to wait for caches to sync")
 	}
 
-	if err := c.InitOVN(); err != nil {
-		klog.Fatalf("failed to init ovn resource %v", err)
-	}
-
 	if err := c.InitDefaultVpc(); err != nil {
 		klog.Fatalf("failed to init default vpc %v", err)
 	}
 
+	if err := c.InitOVN(); err != nil {
+		klog.Fatalf("failed to init ovn resource %v", err)
+	}
+
 	if err := c.InitIPAM(); err != nil {
 		klog.Fatalf("failed to init ipam %v", err)
 	}

diff --git a/pkg/controller/init.go b/pkg/controller/init.go
@@ -91,6 +91,7 @@ func (c *Controller) initDefaultLogicalSwitch() error {
 	defaultSubnet := kubeovnv1.Subnet{
 		ObjectMeta: v1.ObjectMeta{Name: c.config.DefaultLogicalSwitch},
 		Spec: kubeovnv1.SubnetSpec{
+			Vpc:         util.DefaultVpc,
 			Default:     true,
 			Provider:    util.OvnProvider,
 			CIDRBlock:   c.config.DefaultCIDR,
@@ -127,6 +128,7 @@ func (c *Controller) initNodeSwitch() error {
 	nodeSubnet := kubeovnv1.Subnet{
 		ObjectMeta: v1.ObjectMeta{Name: c.config.NodeSwitch},
 		Spec: kubeovnv1.SubnetSpec{
+			Vpc:        util.DefaultVpc,
 			Default:                false,
 			Provider:               util.OvnProvider,
 			CIDRBlock:              c.config.NodeSwitchCIDR,

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -185,7 +185,7 @@ func (c Client) CreateLogicalSwitch(ls, lr, protocol, subnet, gateway string, ex
 			return err
 		}
 	}
-	if ls != c.NodeSwitch && !defaultVpc {
+	if ls != c.NodeSwitch && defaultVpc {
 		// DO NOT add ovn dns/lb to node switch
 		// TODO: custom vpc not support dns/lb now
 		if err := c.addLoadBalancerToLogicalSwitch(c.ClusterTcpLoadBalancer, ls); err != nil {