move chassis judge to the end of node processing

kubeovn · Dec 29, 2021 · c4956ac · c4956ac
1 parent 636b946
commit c4956ac
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -244,14 +244,6 @@ func (c *Controller) handleAddNode(key string) error {
 		return err
 	}
 
-	if err := c.RemoveRedundantChassis(node); err != nil {
-		return err
-	}
-
-	if err := c.retryDelDupChassis(util.ChasRetryTime, util.ChasRetryIntev+2, c.checkChassisDupl, node); err != nil {
-		return err
-	}
-
 	var v4IP, v6IP, mac string
 	portName := fmt.Sprintf("node-%s", key)
 	if node.Annotations[util.AllocatedAnnotation] == "true" && node.Annotations[util.IpAddressAnnotation] != "" && node.Annotations[util.MacAddressAnnotation] != "" {
@@ -331,6 +323,14 @@ func (c *Controller) handleAddNode(key string) error {
 		return err
 	}
 
+	if err := c.RemoveRedundantChassis(node); err != nil {
+		return err
+	}
+
+	if err := c.retryDelDupChassis(util.ChasRetryTime, util.ChasRetryIntev+2, c.checkChassisDupl, node); err != nil {
+		return err
+	}
+
 	return nil
 }