modify kube-ovn as multus-cni problem

pkg/controller/init.go

@@ -511,6 +511,9 @@ func (c *Controller) initAppendPodExternalIds(pod *v1.Pod) error {
 	}
 
 	for _, podNet := range podNets {
+		if !strings.HasSuffix(podNet.ProviderName, util.OvnProvider) {
+			continue
+		}
 		portName := ovs.PodNameToPortName(pod.Name, pod.Namespace, podNet.ProviderName)
 		externalIds, err := c.ovnClient.OvnGet("logical_switch_port", portName, "external_ids", "")
 		if err != nil {

pkg/controller/pod.go

@@ -979,6 +979,7 @@ func (c *Controller) getPodAttachmentNet(pod *v1.Pod) ([]*kubeovnNet, error) {
 		var providerName string
 		if util.IsOvnNetwork(netCfg) {
 			allowLiveMigration := false
+			var subnetName string
 			isDefault := util.IsDefaultNet(pod.Annotations[util.DefaultNetworkAnnotation], attach)
 			if isDefault {
 				providerName = util.OvnProvider
@@ -988,7 +989,12 @@ func (c *Controller) getPodAttachmentNet(pod *v1.Pod) ([]*kubeovnNet, error) {
 					allowLiveMigration = true
 				}
 			}
-			subnetName := pod.Annotations[fmt.Sprintf(util.LogicalSwitchAnnotationTemplate, providerName)]
+			for _, subnet := range subnets {
+				if !isDefault && subnet.Spec.Provider == providerName {
+					subnetName = subnet.Name
+					break
+				}
+			}
 			if subnetName == "" {
 				subnetName = c.config.DefaultLogicalSwitch
 			}
@@ -1004,21 +1010,19 @@ func (c *Controller) getPodAttachmentNet(pod *v1.Pod) ([]*kubeovnNet, error) {
 				IsDefault:          isDefault,
 				AllowLiveMigration: allowLiveMigration,
 			})
-
-		}
-
-		providerName = fmt.Sprintf("%s.%s", attach.Name, attach.Namespace)
-		for _, subnet := range subnets {
-			if subnet.Spec.Provider == providerName {
-				result = append(result, &kubeovnNet{
-					Type:         providerTypeIPAM,
-					ProviderName: providerName,
-					Subnet:       subnet,
-				})
-				break
+		} else {
+			providerName = fmt.Sprintf("%s.%s", attach.Name, attach.Namespace)
+			for _, subnet := range subnets {
+				if subnet.Spec.Provider == providerName {
+					result = append(result, &kubeovnNet{
+						Type:         providerTypeIPAM,
+						ProviderName: providerName,
+						Subnet:       subnet,
+					})
+					break
+				}
 			}
 		}
-
 	}
 	return result, nil
 }

pkg/controller/subnet.go

@@ -1125,7 +1125,7 @@ func calcSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error {
 }
 
 func isOvnSubnet(subnet *kubeovnv1.Subnet) bool {
-	if subnet.Spec.Provider == util.OvnProvider || subnet.Spec.Provider == "" {
+	if subnet.Spec.Provider == util.OvnProvider || subnet.Spec.Provider == "" || strings.HasSuffix(subnet.Spec.Provider, "ovn") {
 		return true
 	}
 	return false