fix: Fixing stateless CNI delete flow

Author: behzad-mir

cni/network/network.go

@@ -1085,6 +1085,11 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 				logger.Error("Get Endpoint State API returned error", zap.String("containerID", args.ContainerID), zap.Error(err))
 				return plugin.RetriableError(fmt.Errorf("failed to delete endpoint: %w", err))
 			}
+		} else {
+			for i, epInfo := range epInfos {
+				logger.Info("Found endpoint to delete", zap.String("IfName", epInfo.IfName), zap.String("EndpointID", epInfo.EndpointID), zap.Any("NICType", epInfo.NICType))
+				epInfos[i].NetNsPath = args.Netns // in case DelegatedNIC need to be moved to host namespace
+			}
 		}
 	} else {
 		epInfos = plugin.nm.GetEndpointInfosFromContainerID(args.ContainerID)

cns/restserver/ipam.go

@@ -1313,16 +1313,12 @@ func updateIPInfoMap(iPInfo map[string]*IPInfo, interfaceInfo *IPInfo, ifName, e
 		iPInfo[ifName].MacAddress = interfaceInfo.MacAddress
 		logger.Printf("[updateEndpoint] update the endpoint %s with MacAddress  %s", endpointID, interfaceInfo.MacAddress)
 	}
-	if interfaceInfo.NetworkNameSpace != "" {
-		iPInfo[ifName].NetworkNameSpace = interfaceInfo.NetworkNameSpace
-		logger.Printf("[updateEndpoint] update the endpoint %s with NetworkNameSpace  %s", endpointID, interfaceInfo.NetworkNameSpace)
-	}
 }
 
 // verifyUpdateEndpointStateRequest verify the CNI request body for the UpdateENdpointState API
 func verifyUpdateEndpointStateRequest(req map[string]*IPInfo) error {
 	for ifName, InterfaceInfo := range req {
-		if InterfaceInfo.HostVethName == "" && InterfaceInfo.HnsEndpointID == "" && InterfaceInfo.NICType == "" && InterfaceInfo.MacAddress == "" && InterfaceInfo.NetworkNameSpace == "" {
+		if InterfaceInfo.HostVethName == "" && InterfaceInfo.HnsEndpointID == "" && InterfaceInfo.NICType == "" && InterfaceInfo.MacAddress == "" {
 			return errors.New("[updateEndpoint] No NicType, MacAddress, HnsEndpointID or HostVethName has been provided")
 		}
 		if ifName == "" {

cns/restserver/restserver.go

@@ -126,14 +126,13 @@ type EndpointInfo struct {
 }
 
 type IPInfo struct {
-	IPv4             []net.IPNet
-	IPv6             []net.IPNet `json:",omitempty"`
-	HnsEndpointID    string      `json:",omitempty"`
-	HnsNetworkID     string      `json:",omitempty"`
-	HostVethName     string      `json:",omitempty"`
-	MacAddress       string      `json:",omitempty"`
-	NICType          cns.NICType `json:",omitempty"`
-	NetworkNameSpace string      `json:",omitempty"`
+	IPv4          []net.IPNet
+	IPv6          []net.IPNet `json:",omitempty"`
+	HnsEndpointID string      `json:",omitempty"`
+	HnsNetworkID  string      `json:",omitempty"`
+	HostVethName  string      `json:",omitempty"`
+	MacAddress    string      `json:",omitempty"`
+	NICType       cns.NICType `json:",omitempty"`
 }
 
 type GetHTTPServiceDataResponse struct {

network/manager.go

@@ -822,7 +822,6 @@ func cnsEndpointInfotoCNIEpInfos(endpointInfo restserver.EndpointInfo, endpointI
 		epInfo.NICType = ipInfo.NICType
 		epInfo.HNSNetworkID = ipInfo.HnsNetworkID
 		epInfo.MacAddress = net.HardwareAddr(ipInfo.MacAddress)
-		epInfo.NetNsPath = ipInfo.NetworkNameSpace
 		ret = append(ret, epInfo)
 	}
 	return ret
@@ -851,12 +850,11 @@ func generateCNSIPInfoMap(eps []*endpoint) map[string]*restserver.IPInfo {
 
 	for _, ep := range eps {
 		ifNametoIPInfoMap[ep.IfName] = &restserver.IPInfo{ // in windows, the nicname is args ifname, in linux, it's ethX
-			NICType:          ep.NICType,
-			HnsEndpointID:    ep.HnsId,
-			HnsNetworkID:     ep.HNSNetworkID,
-			HostVethName:     ep.HostIfName,
-			MacAddress:       ep.MacAddress.String(),
-			NetworkNameSpace: ep.NetworkNameSpace,
+			NICType:       ep.NICType,
+			HnsEndpointID: ep.HnsId,
+			HnsNetworkID:  ep.HNSNetworkID,
+			HostVethName:  ep.HostIfName,
+			MacAddress:    ep.MacAddress.String(),
 		}
 	}
 

network/manager_test.go

@@ -548,22 +548,20 @@ func TestCnsEndpointInfotoCNIEpInfos_Cases(t *testing.T) {
 		expectedNICType cns.NICType
 	}{
 		{
-			name:   "With NetworkNameSpace and DelegatedVMNIC",
+			name:   "DelegatedVMNIC",
 			ifName: "eth1",
 			ipInfo: restserver.IPInfo{
-				NetworkNameSpace: "/var/run/netns/testns",
-				NICType:          cns.DelegatedVMNIC,
+				NICType: cns.DelegatedVMNIC,
 			},
 			expectedNetNs:   "/var/run/netns/testns",
 			expectedIfName:  "eth1",
 			expectedNICType: cns.DelegatedVMNIC,
 		},
 		{
-			name:   "Empty NetworkNameSpace and InfraNIC",
+			name:   "InfraNIC",
 			ifName: "eth0",
 			ipInfo: restserver.IPInfo{
-				NetworkNameSpace: "",
-				NICType:          cns.InfraNIC,
+				NICType: cns.InfraNIC,
 			},
 			expectedNetNs:   "",
 			expectedIfName:  "eth0",

network/secondary_endpoint_client_linux.go

@@ -191,14 +191,14 @@ func (client *SecondaryEndpointClient) DeleteEndpoints(ep *endpoint) error {
 	}()
 	// For stateless cni linux, check if delegated vmnic type, and if so, delete using this *endpoint* struct's ifname
 	if ep.NICType == cns.DelegatedVMNIC {
-		if err := client.moveInterfaceToHostNetns(ep, ep.IfName, vmns); err != nil {
+		if err := client.moveInterfaceToHostNetns(ep.IfName, vmns); err != nil {
 			logger.Error("Failed to move interface", zap.String("IfName", ep.IfName), zap.Error(newErrorSecondaryEndpointClient(err)))
 		}
 	}
 	// For Statefull cni linux, Use SecondaryInterfaces map to move all interfaces to host netns
 	// TODO: SecondaryInterfaces map should be retired and only IfName field and NICType should be used to determine the delgated NIC
 	for iface := range ep.SecondaryInterfaces {
-		if err := client.moveInterfaceToHostNetns(ep, iface, vmns); err != nil {
+		if err := client.moveInterfaceToHostNetns(iface, vmns); err != nil {
 			logger.Error("Failed to move interface", zap.String("IfName", iface), zap.Error(newErrorSecondaryEndpointClient(err)))
 			continue
 		}
@@ -209,7 +209,7 @@ func (client *SecondaryEndpointClient) DeleteEndpoints(ep *endpoint) error {
 }
 
 // moveInterfaceToHostNetns moves the given interface to the host netns.
-func (client *SecondaryEndpointClient) moveInterfaceToHostNetns(ep *endpoint, ifName string, vmns int) error {
+func (client *SecondaryEndpointClient) moveInterfaceToHostNetns(ifName string, vmns int) error {
 	logger.Info("Moving interface to host netns", zap.String("IfName", ifName))
 	if err := client.netlink.SetLinkNetNs(ifName, uintptr(vmns)); err != nil {
 		return newErrorSecondaryEndpointClient(err)