adding error checking in network status creation as well

This commit is contained in:
rkamudhan 2018-08-01 15:56:46 +01:00 committed by Kuralamudhan Ramakrishnan
parent 88759d29de
commit 1ad25a890d

View File

@ -246,13 +246,15 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) (cn
} }
//create the network status, only in case Multus as kubeconfig //create the network status, only in case Multus as kubeconfig
if n.Kubeconfig != "" && kc.Podnamespace != "kube-system" { if n.Kubeconfig != "" && kc != nil {
delegateNetStatus, err := types.LoadNetworkStatus(tmpResult, delegate.Conf.Name, delegate.MasterPlugin) if kc.Podnamespace != "kube-system" {
if err != nil { delegateNetStatus, err := types.LoadNetworkStatus(tmpResult, delegate.Conf.Name, delegate.MasterPlugin)
return nil, fmt.Errorf("Multus: Err in setting networks status: %v", err) if err != nil {
} return nil, fmt.Errorf("Multus: Err in setting networks status: %v", err)
}
netStatus = append(netStatus, delegateNetStatus) netStatus = append(netStatus, delegateNetStatus)
}
} }
} }