fixing multus runtime error for network status without pod network annotation

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

View File

@@ -380,7 +380,8 @@ func TryLoadK8sDelegates(k8sArgs *types.K8sArgs, conf *types.NetConf, kubeClient
delegates, err := GetK8sNetwork(kubeClient, k8sArgs, conf.ConfDir)
if err != nil {
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)
}