fix: prevent update failed logs

kubeovn · Aug 8, 2020 · c9d07e1 · c9d07e1
1 parent 6e2e4aa
commit c9d07e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -315,6 +315,7 @@ func (c *Controller) startWorkers(stopCh <-chan struct{}) {
 
 	// add default/join subnet and wait them ready
 	go wait.Until(c.runAddSubnetWorker, time.Second, stopCh)
+	go wait.Until(c.runAddVlanWorker, time.Second, stopCh)
 	for {
 		klog.Infof("wait for %s and %s ready", c.config.DefaultLogicalSwitch, c.config.NodeSwitch)
 		time.Sleep(3 * time.Second)
@@ -370,7 +371,6 @@ func (c *Controller) startWorkers(stopCh <-chan struct{}) {
 		go wait.Until(c.runUpdateNpWorker, time.Second, stopCh)
 		go wait.Until(c.runDeleteNpWorker, time.Second, stopCh)
 
-		go wait.Until(c.runAddVlanWorker, time.Second, stopCh)
 		go wait.Until(c.runDelVlanWorker, time.Second, stopCh)
 		go wait.Until(c.runUpdateVlanWorker, time.Second, stopCh)
 	}

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -365,6 +365,14 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		return nil
 	}
 
+	subnet, err = c.subnetsLister.Get(key)
+	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
+		return err
+	}
+
 	if err := formatSubnet(subnet, c); err != nil {
 		return err
 	}