The eip is not cleaned after eip is deleted (#4718) (#4719)

The ip address in vpc-nat-gw pod is not cleaned after the eip is deleted. This patch fix this problem. Signed-off-by: Rain Suo <[email protected]>
kubeovn · Nov 12, 2024 · 92a0d95 · 92a0d95
1 parent e806b53
commit 92a0d95
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pkg/controller/vpc_nat_gw_eip.go b/pkg/controller/vpc_nat_gw_eip.go
@@ -210,7 +210,13 @@ func (c *Controller) handleUpdateIptablesEip(key string) error {
 	if !cachedEip.DeletionTimestamp.IsZero() {
 		klog.Infof("clean eip %q in pod", key)
 		if vpcNatEnabled == "true" {
-			if err = c.deleteEipInPod(cachedEip.Spec.NatGwDp, v4Cidr); err != nil {
+			v4ipCidr, err := util.GetIPAddrWithMask(cachedEip.Status.IP, v4Cidr)
+			if err != nil {
+				err = fmt.Errorf("failed to get eip %s with mask by cidr %s: %w", cachedEip.Status.IP, v4Cidr, err)
+				klog.Error(err)
+				return err
+			}
+			if err = c.deleteEipInPod(cachedEip.Spec.NatGwDp, v4ipCidr); err != nil {
 				klog.Errorf("failed to clean eip '%s' in pod, %v", key, err)
 				return err
 			}