github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-10-21 23:48:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #258 from dcbw/teardown-add-cleanup

Browse Source 
multus: simplify teardown on add error and clarify error message
This commit is contained in:
Doug Smith
2019-02-07 10:10:32 -05:00
committed by GitHub
parent 34231166ae 063a3593b8
commit d9188e4463
3 changed files with 69 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
types/conf.go
View File

@@ -93,7 +93,7 @@ func LoadDelegateNetConf(bytes []byte, net *NetworkSelectionElement, deviceID st
return delegateConf, nil
}
func LoadCNIRuntimeConf(args *skel.CmdArgs, k8sArgs *K8sArgs, ifName string, rc *RuntimeConfig) (*libcni.RuntimeConf, error) {
func CreateCNIRuntimeConf(args *skel.CmdArgs, k8sArgs *K8sArgs, ifName string, rc *RuntimeConfig) *libcni.RuntimeConf {
logging.Debugf("LoadCNIRuntimeConf: %v, %v, %s, %v", args, k8sArgs, ifName, rc)
// In part, adapted from K8s pkg/kubelet/dockershim/network/cni/cni.go#buildCNIRuntimeConf
@@ -116,7 +116,7 @@ func LoadCNIRuntimeConf(args *skel.CmdArgs, k8sArgs *K8sArgs, ifName string, rc
"portMappings": rc.PortMaps,
}
}
return rt, nil
return rt
}
func LoadNetworkStatus(r types.Result, netName string, defaultNet bool) (*NetworkStatus, error) {