fix lost vendor

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
kubeovn · Mar 3, 2024 · ac0a150 · ac0a150
1 parent 40e0f32
commit ac0a150
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -1036,6 +1036,19 @@ func (c *Controller) handleDeletePod(key string) error {
 	}
 	isVMPod, vmName := isVMPod(pod)
 	if isVMPod && c.config.EnableKeepVMIP {
+		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 {
+			klog.Infof("clean migrate options for vm lsp %s", port.Name)
+			if err := c.OVNNbClient.CleanLogicalSwitchPortMigrateOptions(port.Name); err != nil {
+				err = fmt.Errorf("failed to clean migrate options for vm lsp %s, %v", port.Name, err)
+				klog.Error(err)
+				return err
+			}
+		}
 		vmToBeDel := c.isVMToDel(pod, vmName)
 		isDelete, err := appendCheckPodToDel(c, pod, vmName, util.VMInstance)
 		if pod.DeletionTimestamp != nil {
@@ -1142,19 +1155,6 @@ 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)

diff --git a/pkg/ovs/ovn-nb-logical_switch_port.go b/pkg/ovs/ovn-nb-logical_switch_port.go
@@ -33,7 +33,7 @@ func buildLogicalSwitchPort(lspName, lsName, ip, mac, podName, namespace string,
 
 	// addresses is the first element of addresses
 	lsp.Addresses = []string{strings.TrimSpace(strings.Join(addresses, " "))}
-
+	lsp.ExternalIDs["vendor"] = util.CniTypeName
 	if portSecurity {
 		if len(vips) != 0 {
 			addresses = append(addresses, vipList...)
@@ -868,7 +868,7 @@ func (c *OVNNbClient) GetLogicalSwitchPortMigrateOptions(lspName string) (*ovnnb
 			return lsp, splits[0], splits[1], nil
 		}
 	}
-	return nil, "", "", nil
+	return lsp, "", "", nil
 }
 
 func (c *OVNNbClient) ResetLogicalSwitchPortMigrateOptions(lspName, srcNodeName, targetNodeName string, migratedFail bool) error {
@@ -895,7 +895,6 @@ func (c *OVNNbClient) ResetLogicalSwitchPortMigrateOptions(lspName, srcNodeName,
 		lsp.Options["requested-chassis"] = targetNodeName
 	}
 	delete(lsp.Options, "activation-strategy")
-	klog.Infof("reset migrator logical switch port %s options: %v", lspName, lsp.Options)
 	if err := c.UpdateLogicalSwitchPort(lsp, &lsp.Options); err != nil {
 		err = fmt.Errorf("failed to reset options for migrator logical switch port %s: %v", lspName, err)
 		klog.Error(err)