fix ip clean (#5193)

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

Author: zbb88888

pkg/controller/init.go

@@ -371,6 +371,11 @@ func (c *Controller) InitIPAM() error {
 	}
 
 	for _, ip := range ips {
+		if !ip.DeletionTimestamp.IsZero() {
+			klog.Infof("enqueue update for removing finalizer to delete ip %s", ip.Name)
+			c.updateIPQueue.Add(ip.Name)
+			continue
+		}
 		// recover sts and kubevirt vm ip, other ip recover in later pod loop
 		if ip.Spec.PodType != util.StatefulSet && ip.Spec.PodType != util.VM {
 			continue
@@ -625,8 +630,8 @@ func (c *Controller) syncIPCR() error {
 
 	ipMap := strset.New(c.getVMLsps()...)
 	for _, ip := range ips {
-		if !ip.DeletionTimestamp.IsZero() && len(ip.GetFinalizers()) != 0 {
-			klog.Infof("enqueue update for deleting ip %s", ip.Name)
+		if !ip.DeletionTimestamp.IsZero() {
+			klog.Infof("enqueue update for removing finalizer to delete ip %s", ip.Name)
 			c.updateIPQueue.Add(ip.Name)
 			continue
 		}

pkg/controller/ip.go

@@ -228,6 +228,10 @@ func (c *Controller) handleAddReservedIP(key string) error {
 		return err
 	}
 	klog.V(3).Infof("handle add reserved ip %s", ip.Name)
+	if !ip.DeletionTimestamp.IsZero() {
+		klog.Infof("handle add process stop for deleting ip %s", ip.Name)
+		return nil
+	}
 	if ip.Spec.Subnet == "" {
 		err := errors.New("subnet parameter cannot be empty")
 		klog.Error(err)
@@ -510,7 +514,12 @@ func (c *Controller) createOrUpdateIPCR(ipCRName, podName, ip, mac, subnetName,
 		// the returned pointer is not nil if the CR does not exist
 		ipCR = nil
 	}
-
+	if ipCR != nil && !ipCR.DeletionTimestamp.IsZero() {
+		// this ip is being deleted, no need to update
+		klog.Infof("enqueue update for removing finalizer to delete ip %s", ipCR.Name)
+		c.updateIPQueue.Add(ipCR.Name)
+		return nil
+	}
 	v4IP, v6IP := util.SplitStringIP(ip)
 	if ipCR == nil {
 		ipCR, err = c.config.KubeOvnClient.KubeovnV1().IPs().Create(context.Background(), &kubeovnv1.IP{