fix: when delete node recycle related ip/route resource

kubeovn · Nov 28, 2019 · 7617fa7 · 7617fa7
1 parent 1383a6f
commit 7617fa7
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 17 deletions.
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -203,7 +203,7 @@ func (c *Controller) handleAddNode(key string) error {
 
 	nodeAddr := getNodeInternalIP(node)
 	if util.CheckProtocol(nodeAddr) == util.CheckProtocol(nic.IpAddress) {
-		err = c.ovnClient.AddStaticRouter("", nodeAddr, strings.Split(nic.IpAddress, "/")[0], c.config.ClusterRouter)
+		err = c.ovnClient.AddStaticRoute("", nodeAddr, strings.Split(nic.IpAddress, "/")[0], c.config.ClusterRouter)
 		if err != nil {
 			klog.Errorf("failed to add static router from node to ovn0 %v", err)
 			return err
@@ -297,25 +297,26 @@ func (c *Controller) handleAddNode(key string) error {
 }
 
 func (c *Controller) handleDeleteNode(key string) error {
-	err := c.ovnClient.DeletePort(fmt.Sprintf("node-%s", key))
+	portName := fmt.Sprintf("node-%s", key)
+	err := c.ovnClient.DeletePort(portName)
 	if err != nil {
-		klog.Infof("failed to delete node switch port node-%s %v", key, err)
+		klog.Errorf("failed to delete node switch port node-%s %v", key, err)
 		return err
 	}
 
-	ipCr, err := c.config.KubeOvnClient.KubeovnV1().IPs().Get(key, metav1.GetOptions{})
+	ipCr, err := c.config.KubeOvnClient.KubeovnV1().IPs().Get(portName, metav1.GetOptions{})
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
 			return nil
 		}
 		return err
 	}
 
-	if err := c.ovnClient.DeleteStaticRouter(ipCr.Spec.IPAddress, c.config.ClusterRouter); err != nil {
+	if err := c.ovnClient.DeleteStaticRouteByNextHop(ipCr.Spec.IPAddress); err != nil {
 		return err
 	}
 
-	err = c.config.KubeOvnClient.KubeovnV1().IPs().Delete(key, &metav1.DeleteOptions{})
+	err = c.config.KubeOvnClient.KubeovnV1().IPs().Delete(portName, &metav1.DeleteOptions{})
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
 			return nil

diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -638,11 +638,22 @@ func (c *Controller) handleDeletePod(key string) error {
 			return err
 		}
 	} else {
-		if err := c.ovnClient.DeleteStaticRouter(portAddr[1], c.config.ClusterRouter); err != nil {
+		if err := c.ovnClient.DeleteStaticRoute(portAddr[1], c.config.ClusterRouter); err != nil {
 			return err
 		}
 	}
-	return c.ovnClient.DeletePort(ovs.PodNameToPortName(name, namespace))
+	if err := c.ovnClient.DeletePort(ovs.PodNameToPortName(name, namespace)); err != nil {
+		klog.Errorf("failed to delete lsp %s, %v", ovs.PodNameToPortName(name, namespace), err)
+		return err
+	}
+
+	err = c.config.KubeOvnClient.KubeovnV1().IPs().Delete(ovs.PodNameToPortName(name, namespace), &metav1.DeleteOptions{})
+	if err == nil || k8serrors.IsNotFound(err) {
+		return nil
+	}
+
+	klog.Errorf("failed to delete ip %s, %v", ovs.PodNameToPortName(name, namespace), err)
+	return err
 }
 
 func (c *Controller) handleUpdatePod(key string) error {
@@ -698,10 +709,10 @@ func (c *Controller) handleUpdatePod(key string) error {
 		if err != nil {
 			return err
 		}
-		if err := c.ovnClient.DeleteStaticRouter(podIP, c.config.ClusterRouter); err != nil {
+		if err := c.ovnClient.DeleteStaticRoute(podIP, c.config.ClusterRouter); err != nil {
 			return errors.Annotate(err, "del static route failed")
 		}
-		if err := c.ovnClient.AddStaticRouter(ovs.PolicySrcIP, podIP, nodeTunlIPAddr.String(), c.config.ClusterRouter); err != nil {
+		if err := c.ovnClient.AddStaticRoute(ovs.PolicySrcIP, podIP, nodeTunlIPAddr.String(), c.config.ClusterRouter); err != nil {
 			return errors.Annotate(err, "add static route failed")
 		}
 	}

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -513,10 +513,10 @@ func (c *Controller) reconcileCentralizedGateway(subnet *kubeovnv1.Subnet) error
 		return err
 	}
 
-	if err := c.ovnClient.DeleteStaticRouter(subnet.Spec.CIDRBlock, c.config.ClusterRouter); err != nil {
+	if err := c.ovnClient.DeleteStaticRoute(subnet.Spec.CIDRBlock, c.config.ClusterRouter); err != nil {
 		return errors.Annotate(err, "del static route failed")
 	}
-	if err := c.ovnClient.AddStaticRouter(ovs.PolicySrcIP, subnet.Spec.CIDRBlock, nodeTunlIPAddr.String(), c.config.ClusterRouter); err != nil {
+	if err := c.ovnClient.AddStaticRoute(ovs.PolicySrcIP, subnet.Spec.CIDRBlock, nodeTunlIPAddr.String(), c.config.ClusterRouter); err != nil {
 		return errors.Annotate(err, "add static route failed")
 	}
 
@@ -669,7 +669,7 @@ func (c *Controller) handleDeleteRoute(key string) error {
 		return nil
 	}
 
-	return c.ovnClient.DeleteStaticRouter(key, c.config.ClusterRouter)
+	return c.ovnClient.DeleteStaticRoute(key, c.config.ClusterRouter)
 }
 
 func (c *Controller) handleDeleteSubnet(key string) error {

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -256,21 +256,37 @@ func (c Client) createRouterPort(ls, lr, ip, mac string) error {
 	return nil
 }
 
-// AddStaticRouter add a static route rule in ovn
-func (c Client) AddStaticRouter(policy, cidr, nextHop, router string) error {
+// AddStaticRoute add a static route rule in ovn
+func (c Client) AddStaticRoute(policy, cidr, nextHop, router string) error {
 	if policy == "" {
 		policy = PolicyDstIP
 	}
 	_, err := c.ovnNbCommand(MayExist, fmt.Sprintf("%s=%s", Policy, policy), "lr-route-add", router, cidr, nextHop)
 	return err
 }
 
-// DeleteStaticRouter delete a static route rule in ovn
-func (c Client) DeleteStaticRouter(cidr, router string) error {
+// DeleteStaticRoute delete a static route rule in ovn
+func (c Client) DeleteStaticRoute(cidr, router string) error {
 	_, err := c.ovnNbCommand(IfExists, "lr-route-del", router, cidr)
 	return err
 }
 
+func (c Client) DeleteStaticRouteByNextHop(nextHop string) error {
+	output, err := c.ovnNbCommand("--format=csv", "--no-heading", "--data=bare", "--columns=ip_prefix", "find", "Logical_Router_Static_Route", fmt.Sprintf("nexthop=%s", nextHop))
+	if err != nil {
+		klog.Errorf("failed to list static route %s, %v", nextHop, err)
+		return err
+	}
+	ipPrefixes := strings.Split(output, "\n")
+	for _, ipPre := range ipPrefixes {
+		if err := c.DeleteStaticRoute(ipPre, c.ClusterRouter); err != nil {
+			klog.Errorf("failed to delete route %s, %v", ipPre, err)
+			return err
+		}
+	}
+	return nil
+}
+
 // FindLoadbalancer find ovn loadbalancer uuid by name
 func (c Client) FindLoadbalancer(lb string) (string, error) {
 	output, err := c.ovnNbCommand("--data=bare", "--no-heading", "--columns=_uuid",