fix deleting old sb chassis for a re-added node (#2989)

kubeovn · Jun 28, 2023 · 572a2e8 · 572a2e8
1 parent abda156
commit 572a2e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -581,11 +581,8 @@ func (c *Controller) handleUpdateNode(key string) error {
 		return err
 	}
 
-	if node.Annotations[util.ChassisAnnotation] != "" {
-		if err = c.ovnLegacyClient.InitChassisNodeTag(node.Annotations[util.ChassisAnnotation], node.Name); err != nil {
-			klog.Errorf("failed to set chassis nodeTag for node '%s', %v", node.Name, err)
-			return err
-		}
+	if err := c.validateChassis(node); err != nil {
+		return err
 	}
 	if err := c.retryDelDupChassis(util.ChasRetryTime, util.ChasRetryIntev+2, c.checkChassisDupl, node); err != nil {
 		return err

diff --git a/pkg/ovs/ovn-sbctl.go b/pkg/ovs/ovn-sbctl.go
@@ -52,19 +52,15 @@ func (c LegacyClient) ovnSbCommand(cmdArgs ...string) (string, error) {
 }
 
 func (c LegacyClient) DeleteChassisByNode(node string) error {
-	output, err := c.ovnSbCommand("--format=csv", "--no-heading", "--data=bare", "--columns=name", "find", "chassis", fmt.Sprintf("external_ids:node=%s", node))
+	chassis, err := c.GetChassis(node)
 	if err != nil {
 		return fmt.Errorf("failed to get node chassis %s, %v", node, err)
 	}
-	for _, chassis := range strings.Split(output, "\n") {
-		chassis = strings.TrimSpace(chassis)
-		if len(chassis) > 0 {
-			if err := c.DeleteChassisByName(chassis); err != nil {
-				return err
-			}
-		}
+	if chassis == "" {
+		return nil
 	}
-	return nil
+
+	return c.DeleteChassisByName(chassis)
 }
 
 func (c LegacyClient) DeleteChassisByName(chassisName string) error {
@@ -84,12 +80,12 @@ func (c LegacyClient) DeleteChassisByName(chassisName string) error {
 }
 
 func (c LegacyClient) GetChassis(node string) (string, error) {
-	output, err := c.ovnSbCommand("--format=csv", "--no-heading", "--data=bare", "--columns=name", "find", "chassis", fmt.Sprintf("hostname=%s", node))
+	output, err := c.ovnSbCommand("--format=csv", "--no-heading", "--data=bare", "--columns=name", "find", "chassis", fmt.Sprintf("external_ids:node=%s", node))
 	if err != nil {
 		return "", fmt.Errorf("failed to find node chassis %s, %v", node, err)
 	}
 	if len(output) == 0 {
-		output, err = c.ovnSbCommand("--format=csv", "--no-heading", "--data=bare", "--columns=name", "find", "chassis", fmt.Sprintf("external_ids:node=%s", node))
+		output, err = c.ovnSbCommand("--format=csv", "--no-heading", "--data=bare", "--columns=name", "find", "chassis", fmt.Sprintf("hostname=%s", node))
 		if err != nil {
 			return "", fmt.Errorf("failed to find node chassis %s, %v", node, err)
 		}