rancher/multus-cni
1
0
Fork 0
forked from github/multus-cni
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix error type for NoK8sNetworkError"

Browse Source 
This reverts commit 3245ed8577, due to
missing pull request process. will file it again as pull request.
This commit is contained in:
Tomofumi Hayashi
2018-04-23 15:49:16 +09:00
parent 3245ed8577
commit 362be285c9
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
multus/multus.go
View File

@@ -336,19 +336,17 @@ func cmdDel(args *skel.CmdArgs) error {
if in.Kubeconfig != "" {
podDelegate, r := k8s.GetK8sNetwork(args, in.Kubeconfig)
if r != nil {
if _, ok := r.(*NoK8sNetworkError); ok {
nopodnet = true
// no network found from default and annotaed network,
// we do nothing to remove network for the pod!
if !defaultcninetwork {
return fmt.Errorf("Multus: Err in getting k8s network from the poc spec, check the pod spec or set delegate for the default network, Refer the README.md: %v", r)
}
} else {
return fmt.Errorf("Multus: Err in getting k8s network from pod: %v", r)
if r != nil && r.Error() == "nonet" {
nopodnet = true
if !defaultcninetwork {
return fmt.Errorf("Multus: Err in getting k8s network from the poc spec, check the pod spec or set delegate for the default network, Refer the README.md: %v", r)
}
}
if r != nil && !defaultcninetwork {
return fmt.Errorf("Multus: Err in getting k8s network from pod: %v", r)
}
if len(podDelegate) != 0 {
if in.UseDefault {
// In the case that we force the default