fix: CleanLogicalSwitchPortMigrateOptions

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
kubeovn · Mar 3, 2024 · 40e0f32 · 40e0f32
1 parent 2c0a57c
commit 40e0f32
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -729,13 +729,6 @@ func (c *Controller) reconcileAllocateSubnets(cachedPod, pod *v1.Pod, needAlloca
 				DHCPv4OptionsUUID: subnet.Status.DHCPv4OptionsUUID,
 				DHCPv6OptionsUUID: subnet.Status.DHCPv6OptionsUUID,
 			}
-			if isVMPod && !isMigrate {
-				if err := c.OVNNbClient.CleanLogicalSwitchPortMigrateOptions(portName); err != nil {
-					err = fmt.Errorf("failed to clean migrate options for lsp %s, %v", portName, err)
-					klog.Error(err)
-					return nil, err
-				}
-			}
 			if err := c.OVNNbClient.CreateLogicalSwitchPort(subnet.Name, portName, ipStr, mac, podName, pod.Namespace,
 				portSecurity, securityGroupAnnotation, vips, podNet.Subnet.Spec.EnableDHCP, dhcpOptions, subnet.Spec.Vpc); err != nil {
 				c.recorder.Eventf(pod, v1.EventTypeWarning, "CreateOVNPortFailed", err.Error())
@@ -1149,6 +1142,19 @@ func (c *Controller) handleDeletePod(key string) error {
 				return err
 			}
 		}
+	} else if isVMPod {
+		ports, err := c.OVNNbClient.ListNormalLogicalSwitchPorts(true, map[string]string{"pod": podKey})
+		if err != nil {
+			klog.Errorf("failed to list lsps of pod '%s', %v", pod.Name, err)
+			return err
+		}
+		for _, port := range ports {
+			if err := c.OVNNbClient.CleanLogicalSwitchPortMigrateOptions(port.Name); err != nil {
+				err = fmt.Errorf("failed to clean migrate options for lsp %s, %v", port.Name, err)
+				klog.Error(err)
+				return err
+			}
+		}
 	}
 	for _, podNet := range podNets {
 		c.syncVirtualPortsQueue.Add(podNet.Subnet.Name)