github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-20 09:01:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #236 from hanxueluo/master

Browse Source 
fix crash caused by empty delegates when use clusterNetwork
This commit is contained in:
Doug Smith
2019-02-26 07:17:36 -05:00
committed by GitHub
parent 260316398f 49d55d6f45
commit 0010cd99ff
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
multus/multus.go
View File

@@ -417,6 +417,15 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) err
return logging.Errorf("Multus: Err in getting k8s args: %v", err)
}
if in.ClusterNetwork != "" {
err = k8s.GetDefaultNetworks(k8sArgs, in, kubeClient)
if err != nil {
return logging.Errorf("Multus: Failed to get clusterNetwork/defaultNetworks: %v", err)
}
// First delegate is always the master plugin
in.Delegates[0].MasterPlugin = true
}
numK8sDelegates, kc, err := k8s.TryLoadPodDelegates(k8sArgs, in, kubeClient)
if err != nil {
return err