Fixing providing wrong interface name to be deleted during CNI_DEL operation in case Pod has multiple interfaces

CNI result is effectively ignored during CNI_DEL, an empty current.Result is returned to Kubelet

Author: Levovar

build_danm.sh

@@ -30,9 +30,9 @@ error_handler()
   exit $1
 }
 
-if [[ ( "$TRAVIS_PIPELINE" = "buildah" ) || ( -n "$TRAVIS_PIPELINE" && -x "$(command -v buildah)" ) ]]; then
+if [[ ( "$TRAVIS_PIPELINE" = "buildah" ) || ( "$TRAVIS_PIPELINE" = ""  && -x "$(command -v buildah)" ) ]]; then
   source ./build_buildah.sh
-elif [[ ( "$TRAVIS_PIPELINE" = "docker" ) || ( -n "$TRAVIS_PIPELINE" && -x "$(command -v docker)" ) ]]; then
+elif [[ ( "$TRAVIS_PIPELINE" = "docker" ) || ( "$TRAVIS_PIPELINE" = ""  && -x "$(command -v docker)" ) ]]; then
   source ./build_docker.sh
 else
  echo 'The build process requires docker or buildah/podman installed. Please install any of these and make sure these are executable'

pkg/cnidel/cnidel.go

@@ -131,19 +131,23 @@ func getCniPluginConfig(netInfo *danmtypes.DanmNet, ipamOptions danmtypes.IpamCo
 func execCniPlugin(cniType string, netInfo *danmtypes.DanmNet, rawConfig []byte, ep *danmtypes.DanmEp) (types.Result,error) {
   cniPath, cniArgs, err := getExecCniParams(cniType, netInfo, ep)
   if err != nil {
-    return nil, err
+    return nil, errors.New("exec CNI params couldn't be gathered:" + err.Error())
   }
   exec := invoke.RawExec{Stderr: os.Stderr}
   rawResult, err := exec.ExecPlugin(cniPath, rawConfig, cniArgs)
   if err != nil {
-    return nil, err
+    return nil, errors.New("OS exec call failed:" + err.Error())
   }
   versionDecoder := &version.ConfigDecoder{}
-  confVersion, err := versionDecoder.Decode(rawConfig)
-  if err != nil {
-    return nil, err
+  confVersion, err := versionDecoder.Decode(rawConfig)  
+  if err != nil || rawResult == nil {
+    return &current.Result{}, nil
+  }
+  convertedResult, err := version.NewResult(confVersion, rawResult)
+  if err != nil || convertedResult == nil {
+    return &current.Result{}, nil
   }
-  return version.NewResult(confVersion, rawResult)
+  return convertedResult, nil
 }
 
 func getExecCniParams(cniType string, netInfo *danmtypes.DanmNet, ep *danmtypes.DanmEp) (string,[]string,error) {
@@ -183,7 +187,7 @@ func DelegateInterfaceDelete(danmClient danmclientset.Interface, netInfo *danmty
     return err
   }
   cniType := netInfo.Spec.NetworkType
-  err = invoke.DelegateDel(cniType, rawConfig)
+  _, err = execCniPlugin(cniType, netInfo, rawConfig, ep)
   if err != nil {
     freeDelegatedIps(danmClient, netInfo, ep.Spec.Iface.Address, ep.Spec.Iface.AddressIPv6)
     return errors.New("Error delegating DEL to CNI plugin:" + cniType + " because:" + err.Error())