fix issue 5167: Add Finalizer when create snat

pkg/controller/vpc_nat_gw_nat.go

@@ -12,7 +12,6 @@
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/cache"
-	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
@@ -22,7 +21,7 @@
 
 func (c *Controller) enqueueAddIptablesFip(obj any) {
 	key := cache.MetaObjectToName(obj.(*kubeovnv1.IptablesFIPRule)).String()
 	klog.V(3).Infof("enqueue add iptables fip %s", key)
 	c.addIptablesFipQueue.Add(key)
 }
 
@@ -31,7 +30,7 @@
 	newFip := newObj.(*kubeovnv1.IptablesFIPRule)
 	key := cache.MetaObjectToName(newFip).String()
 	if !newFip.DeletionTimestamp.IsZero() {
 		klog.V(3).Infof("enqueue update to clean fip %s", key)
 		c.updateIptablesFipQueue.Add(key)
 		return
 	}
@@ -43,7 +42,7 @@
 		oldFip.Spec.EIP != newFip.Spec.EIP ||
 		oldFip.Status.Redo != newFip.Status.Redo ||
 		oldFip.Spec.InternalIP != newFip.Spec.InternalIP {
 		klog.V(3).Infof("enqueue update fip %s", key)
 		c.updateIptablesFipQueue.Add(key)
 		return
 	}
@@ -51,13 +50,13 @@
 
 func (c *Controller) enqueueDelIptablesFip(obj any) {
 	key := cache.MetaObjectToName(obj.(*kubeovnv1.IptablesFIPRule)).String()
 	klog.V(3).Infof("enqueue delete iptables fip %s", key)
 	c.delIptablesFipQueue.Add(key)
 }
 
 func (c *Controller) enqueueAddIptablesDnatRule(obj any) {
 	key := cache.MetaObjectToName(obj.(*kubeovnv1.IptablesDnatRule)).String()
 	klog.V(3).Infof("enqueue add iptables dnat %s", key)
 	c.addIptablesDnatRuleQueue.Add(key)
 }
 
@@ -66,7 +65,7 @@
 	newDnat := newObj.(*kubeovnv1.IptablesDnatRule)
 	key := cache.MetaObjectToName(newDnat).String()
 	if !newDnat.DeletionTimestamp.IsZero() {
 		klog.V(3).Infof("enqueue update to clean dnat %s", key)
 		c.updateIptablesDnatRuleQueue.Add(key)
 		return
 	}
@@ -83,7 +82,7 @@
 		oldDnat.Spec.InternalIP != newDnat.Spec.InternalIP ||
 		oldDnat.Spec.InternalPort != newDnat.Spec.InternalPort ||
 		oldDnat.Spec.ExternalPort != newDnat.Spec.ExternalPort {
 		klog.V(3).Infof("enqueue update dnat %s", key)
 		c.updateIptablesDnatRuleQueue.Add(key)
 		return
 	}
@@ -91,13 +90,13 @@
 
 func (c *Controller) enqueueDelIptablesDnatRule(obj any) {
 	key := cache.MetaObjectToName(obj.(*kubeovnv1.IptablesDnatRule)).String()
 	klog.V(3).Infof("enqueue delete iptables dnat %s", key)
 	c.delIptablesDnatRuleQueue.Add(key)
 }
 
 func (c *Controller) enqueueAddIptablesSnatRule(obj any) {
 	key := cache.MetaObjectToName(obj.(*kubeovnv1.IptablesSnatRule)).String()
 	klog.V(3).Infof("enqueue add iptables snat %s", key)
 	c.addIptablesSnatRuleQueue.Add(key)
 }
 
@@ -106,7 +105,7 @@
 	newSnat := newObj.(*kubeovnv1.IptablesSnatRule)
 	key := cache.MetaObjectToName(newSnat).String()
 	if !newSnat.DeletionTimestamp.IsZero() {
 		klog.V(3).Infof("enqueue update to clean snat %s", key)
 		c.updateIptablesSnatRuleQueue.Add(key)
 		return
 	}
@@ -930,8 +929,7 @@
 		return nil
 	}
 	newIptablesSnat := cachedIptablesSnat.DeepCopy()
-	controllerutil.RemoveFinalizer(newIptablesSnat, util.DepreciatedFinalizerName)
-	controllerutil.RemoveFinalizer(newIptablesSnat, util.KubeOVNControllerFinalizer)
+	controllerutil.AddFinalizer(newIptablesSnat, util.KubeOVNControllerFinalizer)
 	patch, err := util.GenerateMergePatchPayload(cachedIptablesSnat, newIptablesSnat)
 	if err != nil {
 		klog.Errorf("failed to generate patch payload for iptables snat '%s', %v", cachedIptablesSnat.Name, err)