fix after review

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

Author: zbb88888

pkg/controller/ippool.go

@@ -52,7 +52,7 @@ func (c *Controller) enqueueUpdateIPPool(oldObj, newObj any) {
 	newIPPool := newObj.(*kubeovnv1.IPPool)
 	if !newIPPool.DeletionTimestamp.IsZero() {
 		klog.V(3).Infof("enqueue delete ippool %s due to deletion timestamp", cache.MetaObjectToName(newIPPool).String())
-		c.deleteIPPoolQueue.Add(newIPPool.DeepCopy())
+		c.deleteIPPoolQueue.Add(newIPPool)
 		return
 	}
 	if !slices.Equal(oldIPPool.Spec.Namespaces, newIPPool.Spec.Namespaces) ||

pkg/controller/ovn_eip.go

@@ -73,7 +73,7 @@ func (c *Controller) enqueueDelOvnEip(obj any) {
 
 	key := cache.MetaObjectToName(eip).String()
 	klog.Infof("enqueue del ovn eip %s", key)
-	c.delOvnEipQueue.Add(eip.DeepCopy())
+	c.delOvnEipQueue.Add(eip)
 }
 
 func (c *Controller) handleAddOvnEip(key string) error {
@@ -410,8 +410,7 @@ func (c *Controller) createOrUpdateOvnEipCR(key, subnet, v4ip, v6ip, mac, usageT
 		}
 	}
 	// Trigger subnet status update after CR creation or update
-	time.Sleep(300 * time.Millisecond)
-	c.updateSubnetStatusQueue.Add(subnet)
+	c.updateSubnetStatusQueue.AddAfter(subnet, 300*time.Millisecond)
 	return nil
 }
 
@@ -603,8 +602,7 @@ func (c *Controller) handleDelOvnEipFinalizer(cachedEip *kubeovnv1.OvnEip) error
 	// Trigger subnet status update after finalizer is removed
 	// This ensures subnet status reflects the IP release
 	// Add delay to ensure API server completes the finalizer removal
-	time.Sleep(300 * time.Millisecond)
-	c.updateSubnetStatusQueue.Add(cachedEip.Spec.ExternalSubnet)
+	c.updateSubnetStatusQueue.AddAfter(cachedEip.Spec.ExternalSubnet, 300*time.Millisecond)
 	return nil
 }
 

pkg/controller/subnet.go

@@ -53,7 +53,7 @@ func (c *Controller) enqueueDeleteSubnet(obj any) {
 	}
 
 	klog.V(3).Infof("enqueue delete subnet %s", subnet.Name)
-	c.deleteSubnetQueue.Add(subnet.DeepCopy())
+	c.deleteSubnetQueue.Add(subnet)
 }
 
 func readyToRemoveFinalizer(subnet *kubeovnv1.Subnet) bool {

pkg/controller/vip.go

@@ -64,7 +64,7 @@ func (c *Controller) enqueueDelVirtualIP(obj any) {
 
 	key := cache.MetaObjectToName(vip).String()
 	klog.Infof("enqueue del vip %s", key)
-	c.delVirtualIPQueue.Add(vip.DeepCopy())
+	c.delVirtualIPQueue.Add(vip)
 }
 
 func (c *Controller) handleAddVirtualIP(key string) error {
@@ -434,8 +434,7 @@ func (c *Controller) createOrUpdateVipCR(key, ns, subnet, v4ip, v6ip, mac string
 		}
 	}
 	// Trigger subnet status update after CR creation or update
-	time.Sleep(300 * time.Millisecond)
-	c.updateSubnetStatusQueue.Add(subnet)
+	c.updateSubnetStatusQueue.AddAfter(subnet, 300*time.Millisecond)
 	return nil
 }
 
@@ -582,8 +581,7 @@ func (c *Controller) handleDelVipFinalizer(key string) error {
 	// Trigger subnet status update after finalizer is removed
 	// This ensures subnet status reflects the IP release
 	// Add delay to ensure API server completes the finalizer removal
-	time.Sleep(300 * time.Millisecond)
-	c.updateSubnetStatusQueue.Add(cachedVip.Spec.Subnet)
+	c.updateSubnetStatusQueue.AddAfter(cachedVip.Spec.Subnet, 300*time.Millisecond)
 	return nil
 }
 

pkg/controller/vpc_nat_gw_eip.go

@@ -59,7 +59,7 @@ func (c *Controller) enqueueDelIptablesEip(obj any) {
 
 	key := cache.MetaObjectToName(eip).String()
 	klog.Infof("enqueue del iptables eip %s", key)
-	c.delIptablesEipQueue.Add(eip.DeepCopy())
+	c.delIptablesEipQueue.Add(eip)
 }
 
 func (c *Controller) handleAddIptablesEip(key string) error {
@@ -685,8 +685,7 @@ func (c *Controller) createOrUpdateEipCR(key, v4ip, v6ip, mac, natGwDp, qos, ext
 		}
 	}
 	// Trigger subnet status update after all operations complete
-	time.Sleep(300 * time.Millisecond)
-	c.updateSubnetStatusQueue.Add(externalNet)
+	c.updateSubnetStatusQueue.AddAfter(externalNet, 300*time.Millisecond)
 	return nil
 }
 
@@ -770,9 +769,8 @@ func (c *Controller) handleDelIptablesEipFinalizer(key string) error {
 	// Trigger subnet status update after finalizer is removed
 	// This ensures subnet status reflects the IP release
 	// Add delay to ensure API server completes the finalizer removal
-	time.Sleep(300 * time.Millisecond)
 	externalNetwork := util.GetExternalNetwork(cachedIptablesEip.Spec.ExternalSubnet)
-	c.updateSubnetStatusQueue.Add(externalNetwork)
+	c.updateSubnetStatusQueue.AddAfter(externalNetwork, 300*time.Millisecond)
 	return nil
 }