use multus-cni as default cni to assign ip

kubeovn · Dec 28, 2021 · a03a858 · a03a858
1 parent 3205b88
commit a03a858
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/cmd/cni/cni.go b/cmd/cni/cni.go
@@ -42,7 +42,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 	if err != nil {
 		return err
 	}
-	if args.IfName == "eth0" {
+	if netConf.Provider == "" && netConf.Type == util.CniTypeName && args.IfName == "eth0" {
 		netConf.Provider = util.OvnProvider
 	}
 
@@ -126,7 +126,7 @@ func cmdDel(args *skel.CmdArgs) error {
 	if err != nil {
 		return err
 	}
-	if args.IfName == "eth0" {
+	if netConf.Type == util.CniTypeName && args.IfName == "eth0" {
 		netConf.Provider = util.OvnProvider
 	}
 

diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -967,13 +967,10 @@ func (c *Controller) getPodAttachmentNet(pod *v1.Pod) ([]*kubeovnNet, error) {
 		var providerName string
 		if util.IsOvnNetwork(netCfg) {
 			isDefault := util.IsDefaultNet(pod.Annotations[util.DefaultNetworkAnnotation], attach)
-			if isDefault {
-				providerName = util.OvnProvider
-			} else {
-				providerName = fmt.Sprintf("%s.%s.ovn", attach.Name, attach.Namespace)
-			}
+			providerName = fmt.Sprintf("%s.%s.ovn", attach.Name, attach.Namespace)
+
 			subnetName := pod.Annotations[fmt.Sprintf(util.LogicalSwitchAnnotationTemplate, providerName)]
-			if !isDefault && subnetName == "" {
+			if subnetName == "" {
 				for _, subnet := range subnets {
 					if subnet.Spec.Provider == providerName {
 						subnetName = subnet.Name