fix: delete chassis_private when delete node

kubeovn · Mar 9, 2021 · 537588c · 537588c
1 parent e5abdef
commit 537588c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -589,7 +589,7 @@ func (c Client) DeleteStaticRoute(cidr, router string) error {
 }
 
 func (c Client) DeleteStaticRouteByNextHop(nextHop string) error {
-	if nextHop == "" {
+	if strings.TrimSpace(nextHop) == "" {
 		return nil
 	}
 	output, err := c.ovnNbCommand("--format=csv", "--no-heading", "--data=bare", "--columns=ip_prefix", "find", "Logical_Router_Static_Route", fmt.Sprintf("nexthop=%s", nextHop))

diff --git a/pkg/ovs/ovn-sbctl.go b/pkg/ovs/ovn-sbctl.go
@@ -57,7 +57,7 @@ func (c Client) DeleteChassis(node string) error {
 	for _, chassis := range strings.Split(output, "\n") {
 		chassis = strings.TrimSpace(chassis)
 		if len(chassis) > 0 {
-			if _, err := c.ovnSbCommand("chassis-del", strings.TrimSpace(chassis)); err != nil {
+			if _, err := c.ovnSbCommand("chassis-del", strings.TrimSpace(chassis), "--", "destroy", "chassis_private", strings.TrimSpace(chassis)); err != nil {
 				return err
 			}
 		}