add nicType for offload

kubeovn · Jun 10, 2021 · aa88e2a · aa88e2a
1 parent 70ac93b
commit aa88e2a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/pkg/daemon/handler.go b/pkg/daemon/handler.go
@@ -107,7 +107,11 @@ func (csh cniServerHandler) handleAdd(req *restful.Request, resp *restful.Respon
 		vlanID = pod.Annotations[fmt.Sprintf(util.VlanIdAnnotationTemplate, podRequest.Provider)]
 		ipAddr = util.GetIpAddrWithMask(ip, cidr)
 		ifName = podRequest.IfName
-		nicType = pod.Annotations[util.PodNicAnnotation]
+		if podRequest.DeviceID != "" {
+			nicType = util.OffloadType
+		} else {
+			nicType = pod.Annotations[util.PodNicAnnotation]
+		}
 		netns = podRequest.NetNs
 		break
 	}
@@ -266,7 +270,12 @@ func (csh cniServerHandler) handleDel(req *restful.Request, resp *restful.Respon
 			}
 		}
 
-		nicType := pod.Annotations[util.PodNicAnnotation]
+		var nicType string
+		if podRequest.DeviceID != "" {
+			nicType = util.OffloadType
+		} else {
+			nicType = pod.Annotations[util.PodNicAnnotation]
+		}
 		err = csh.deleteNic(podRequest.PodName, podRequest.PodNamespace, podRequest.ContainerID, podRequest.DeviceID, podRequest.IfName, nicType)
 		if err != nil {
 			errMsg := fmt.Errorf("del nic failed %v", err)

diff --git a/pkg/util/const.go b/pkg/util/const.go
@@ -104,6 +104,7 @@ const (
 
 	PodNicAnnotation = "ovn.kubernetes.io/pod_nic_type"
 	VethType         = "veth-pair"
+	OffloadType      = "offload-port"
 	InternalType     = "internal-port"
 
 	ChassisLoc     = "/etc/openvswitch/system-id.conf"