github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-06-30 01:21:49 +00:00
Code Issues Projects Releases Wiki Activity

fixing multus runtime error for network status without pod network annotation

Browse Source
This commit is contained in:
rkamudhan 2018-08-01 14:54:10 +01:00 committed by Kuralamudhan Ramakrishnan
parent 02255b40fa
commit d71fe3447f
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
k8sclient/k8sclient.go
View File

@ -380,7 +380,8 @@ func TryLoadK8sDelegates(k8sArgs *types.K8sArgs, conf *types.NetConf, kubeClient
delegates, err := GetK8sNetwork(kubeClient, k8sArgs, conf.ConfDir) delegates, err := GetK8sNetwork(kubeClient, k8sArgs, conf.ConfDir)
if err != nil { if err != nil {
if _, ok := err.(*NoK8sNetworkError); ok { if _, ok := err.(*NoK8sNetworkError); ok {
return 0, nil, nil return 0, clientInfo, nil
//return 0, nil, nil
} }
return 0, nil, fmt.Errorf("Multus: Err in getting k8s network from pod: %v", err) return 0, nil, fmt.Errorf("Multus: Err in getting k8s network from pod: %v", err)
} }

8
multus/multus.go
View File

@ -263,12 +263,14 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) (cn
} }
//set the network status annotation in apiserver, only in case Multus as kubeconfig //set the network status annotation in apiserver, only in case Multus as kubeconfig
if n.Kubeconfig != "" && kc.Podnamespace != "kube-system" { if n.Kubeconfig != "" && kc != nil {
if kc.Podnamespace != "kube-system" {
err = k8s.SetNetworkStatus(kc, netStatus) err = k8s.SetNetworkStatus(kc, netStatus)
if err != nil { if err != nil {
return nil, fmt.Errorf("Multus: Err set the networks status: %v", err) return nil, fmt.Errorf("Multus: Err set the networks status: %v", err)
} }
} }
}
return result, nil return result, nil
} }
@ -317,12 +319,14 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) err
} }
//unset the network status annotation in apiserver, only in case Multus as kubeconfig //unset the network status annotation in apiserver, only in case Multus as kubeconfig
if in.Kubeconfig != "" && kc.Podnamespace != "kube-system" { if in.Kubeconfig != "" && kc != nil {
if kc.Podnamespace != "kube-system" {
err := k8s.SetNetworkStatus(kc, nil) err := k8s.SetNetworkStatus(kc, nil)
if err != nil { if err != nil {
return fmt.Errorf("Multus: Err unset the networks status: %v", err) return fmt.Errorf("Multus: Err unset the networks status: %v", err)
} }
} }
}
rt, _ := types.LoadCNIRuntimeConf(args, k8sArgs, "") rt, _ := types.LoadCNIRuntimeConf(args, k8sArgs, "")
return delPlugins(exec, args.IfName, in.Delegates, len(in.Delegates)-1, rt, in.BinDir) return delPlugins(exec, args.IfName, in.Delegates, len(in.Delegates)-1, rt, in.BinDir)