fix: delete static route should consider dualstack (#2130)

kubeovn · Dec 6, 2022 · 27d22b7 · 27d22b7
1 parent 9b38bf7
commit 27d22b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -879,7 +879,7 @@ func (c *Controller) handleUpdatePod(key string) error {
 						klog.Errorf("failed to add static route, %v", err)
 						return err
 					}
-				} else {
+				} else if c.config.EnableEipSnat {
 					if err := c.ovnLegacyClient.DeleteStaticRoute(podIP, c.config.ClusterRouter); err != nil {
 						return err
 					}

diff --git a/pkg/ovs/ovn-nbctl-legacy.go b/pkg/ovs/ovn-nbctl-legacy.go
@@ -1385,8 +1385,14 @@ func (c LegacyClient) DeleteStaticRoute(cidr, router string) error {
 	if cidr == "" {
 		return nil
 	}
-	_, err := c.ovnNbCommand(IfExists, "lr-route-del", router, cidr)
-	return err
+	for _, cidrBlock := range strings.Split(cidr, ",") {
+		if _, err := c.ovnNbCommand(IfExists, "lr-route-del", router, cidrBlock); err != nil {
+			klog.Errorf("fail to delete static route %s from %s, %v", cidrBlock, router, err)
+			return err
+		}
+	}
+
+	return nil
 }
 
 func (c LegacyClient) DeleteStaticRouteByNextHop(nextHop string) error {