sync the default subnet of ns by vpc's status

kubeovn · Nov 4, 2020 · 5dbaf2d · 5dbaf2d
1 parent dd2234f
commit 5dbaf2d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -515,8 +515,6 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		}
 	}
 
-	c.updateVpcStatusQueue.Add(subnet.Spec.Vpc)
-
 	if err := c.reconcileSubnet(subnet); err != nil {
 		klog.Errorf("reconcile subnet for %s failed, %v", subnet.Name, err)
 		return err
@@ -538,6 +536,7 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		}
 	}
 
+	c.updateVpcStatusQueue.Add(subnet.Spec.Vpc)
 	return nil
 }
 
@@ -628,6 +627,7 @@ func (c *Controller) handleDeleteLogicalSwitch(key string) error {
 }
 
 func (c *Controller) handleDeleteSubnet(subnet *kubeovnv1.Subnet) error {
+	c.updateVpcStatusQueue.Add(subnet.Spec.Vpc)
 	err := c.handleDeleteLogicalSwitch(subnet.Name)
 	if err != nil {
 		klog.Errorf("failed to delete logical switch %s %v", subnet.Name, err)
@@ -640,7 +640,6 @@ func (c *Controller) handleDeleteSubnet(subnet *kubeovnv1.Subnet) error {
 			klog.Errorf("failed to delete router port %s %v", subnet.Name, err)
 			return err
 		}
-		c.updateVpcStatusQueue.Add(subnet.Spec.Vpc)
 	}
 
 	return nil

diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go
@@ -90,6 +90,12 @@ func (c *Controller) handleUpdateVpcStatus(key string) error {
 	if err != nil {
 		return err
 	}
+
+	change := false
+	if vpc.Status.DefaultLogicalSwitch != defaultSubnet {
+		change = true
+	}
+
 	vpc.Status.DefaultLogicalSwitch = defaultSubnet
 	vpc.Status.Subnets = subnets
 	bytes, err := vpc.Status.Bytes()
@@ -98,7 +104,15 @@ func (c *Controller) handleUpdateVpcStatus(key string) error {
 	}
 
 	vpc, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(vpc.Name, types.MergePatchType, bytes, "status")
-	return err
+	if err != nil {
+		return err
+	}
+	if change {
+		for _, ns := range vpc.Spec.Namespaces {
+			c.addNamespaceQueue.Add(ns)
+		}
+	}
+	return nil
 }
 
 func (c *Controller) handleAddOrUpdateVpc(key string) error {