fix: ip delete use wrong key, ip delete only once (#3698)

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
kubeovn · Feb 5, 2024 · a28af4a · a28af4a
1 parent d3ef892
commit a28af4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkg/controller/init.go b/pkg/controller/init.go
@@ -577,6 +577,10 @@ func (c *Controller) syncIPCR() error {
 
  for _, ipCR := range ips {
  ip := ipCR.DeepCopy()
+ if ip.DeletionTimestamp != nil && util.ContainsString(ip.Finalizers, util.ControllerName) {
+ klog.Infof("enqueue update for deleting ip %s", ip.Name)
+ c.updateIPQueue.Add(ip.Name)
+ }
  changed := false
  if ipMap.Has(ip.Name) && ip.Spec.PodType == "" {
  ip.Spec.PodType = util.VM

diff --git a/pkg/controller/ip.go b/pkg/controller/ip.go
@@ -277,6 +277,7 @@ func (c *Controller) handleUpdateIP(key string) error {
  return err
  }
  if !cachedIP.DeletionTimestamp.IsZero() {
+ klog.Infof("handle deleting ip %s", cachedIP.Name)
  subnet, err := c.subnetsLister.Get(cachedIP.Spec.Subnet)
  if err != nil {
  klog.Errorf("failed to get subnet %s: %v", cachedIP.Spec.Subnet, err)
@@ -317,8 +318,9 @@ func (c *Controller) handleUpdateIP(key string) error {
  }
  }
  if cleanIPAM {
- klog.V(3).Infof("release ipam address %s for deleted ip %s from subnet %s", cachedIP.Spec.IPAddress, cachedIP.Name, cachedIP.Spec.Subnet)
- c.ipam.ReleaseAddressByPod(cachedIP.Name, cachedIP.Spec.Subnet)
+ podKey := fmt.Sprintf("%s/%s", cachedIP.Spec.Namespace, cachedIP.Spec.PodName)
+ klog.Infof("ip cr %s release ipam pod key %s from subnet %s", cachedIP.Name, podKey, cachedIP.Spec.Subnet)
+ c.ipam.ReleaseAddressByPod(podKey, cachedIP.Spec.Subnet)
  }
  if err = c.handleDelIPFinalizer(cachedIP, util.ControllerName); err != nil {
  klog.Errorf("failed to handle del ip finalizer %v", err)
@@ -329,7 +331,7 @@ func (c *Controller) handleUpdateIP(key string) error {
 }
 
 func (c *Controller) handleDelIP(ip *kubeovnv1.IP) error {
- klog.V(3).Infof("handle delete ip %s from subnet %s", ip.Name, ip.Spec.Subnet)
+ klog.Infof("deleting ip %s enqueue update status subnet %s", ip.Name, ip.Spec.Subnet)
  c.updateSubnetStatusQueue.Add(ip.Spec.Subnet)
  for _, as := range ip.Spec.AttachSubnets {
  klog.V(3).Infof("enqueue update attach status for subnet %s", as)