github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-29 21:24:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix error type for NoK8sNetworkError

Browse Source 
This fix changes type type for NoK8sNetworkError due to error handling, in #45.
Currently NoK8sNetworkError is not pointer type, just a string, hence we never
get *NoK8sNetworkError. This fix changes it based @One-ders patch.
This commit is contained in:
Tomofumi Hayashi 2018-04-23 15:51:11 +09:00 committed by Kuralamudhan Ramakrishnan
parent 82bece6d73
commit 0bdadc7f39
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
k8sclient/k8sclient.go
View File

@ -30,9 +30,11 @@ import (
) )
// NoK8sNetworkError indicates error, no network in kubernetes // NoK8sNetworkError indicates error, no network in kubernetes
type NoK8sNetworkError string type NoK8sNetworkError struct {
message string
}
func (e NoK8sNetworkError) Error() string { return string(e) } func (e *NoK8sNetworkError) Error() string { return string(e.message) }
func createK8sClient(kubeconfig string) (*kubernetes.Clientset, error) { func createK8sClient(kubeconfig string) (*kubernetes.Clientset, error) {
@ -258,7 +260,7 @@ func GetK8sNetwork(args *skel.CmdArgs, kubeconfig string) ([]map[string]interfac
} }
if len(netAnnot) == 0 { if len(netAnnot) == 0 {
return podNet, NoK8sNetworkError("no kubernetes network found") return podNet, &NoK8sNetworkError{"no kubernetes network found"}
} }
netObjs, err := parsePodNetworkObject(netAnnot) netObjs, err := parsePodNetworkObject(netAnnot)

18
multus/multus.go
View File

@ -336,17 +336,19 @@ func cmdDel(args *skel.CmdArgs) error {
if in.Kubeconfig != "" { if in.Kubeconfig != "" {
podDelegate, r := k8s.GetK8sNetwork(args, in.Kubeconfig) podDelegate, r := k8s.GetK8sNetwork(args, in.Kubeconfig)
if r != nil && r.Error() == "nonet" { if r != nil {
nopodnet = true if _, ok := r.(*k8s.NoK8sNetworkError); ok {
if !defaultcninetwork { nopodnet = true
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) // 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 && !defaultcninetwork {
return fmt.Errorf("Multus: Err in getting k8s network from pod: %v", r)
}
if len(podDelegate) != 0 { if len(podDelegate) != 0 {
if in.UseDefault { if in.UseDefault {
// In the case that we force the default // In the case that we force the default