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

Use typed error when kubernetes network is missing

Browse Source 
Matching error text is error-prone, so use a typed error instead.
This commit is contained in:
Dan Williams
2017-12-02 11:20:09 -06:00
committed by Kuralamudhan Ramakrishnan
parent b2d67c8909
commit 7066439e38
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
multus/multus.go
View File

@@ -405,6 +405,9 @@ func getMultusDelegates(delegate string) ([]map[string]interface{}, error) {
return tmpNetconf.Delegates, nil
}
type NoK8sNetworkError string
func (e NoK8sNetworkError) Error() string { return string(e) }
func getK8sNetwork(args *skel.CmdArgs, kubeconfig string) ([]map[string]interface{}, error) {
k8sArgs := K8sArgs{}
var podNet []map[string]interface{}
@@ -425,7 +428,7 @@ func getK8sNetwork(args *skel.CmdArgs, kubeconfig string) ([]map[string]interfac
}
if len(netAnnot) == 0 {
return podNet, fmt.Errorf(`nonet`)
return podNet, NoK8sNetworkError("no kubernetes network found")
}
netObjs, err := parsePodNetworkObject(netAnnot)
@@ -455,18 +458,18 @@ func cmdAdd(args *skel.CmdArgs) error {
}
if n.Kubeconfig != "" {
podDelegate, r := getK8sNetwork(args, n.Kubeconfig)
if r != nil && r.Error() == "nonet" {
nopodnet = true
if !defaultcninetwork {
return fmt.Errorf("Multus: Err in getting k8s network from the pod spec annotation, check the pod spec or set delegate for the default network, Refer the README.md: %v", r)
podDelegate, err := getK8sNetwork(args, n.Kubeconfig)
if err != nil {
if _, ok := err.(*NoK8sNetworkError); ok {
nopodnet = true
if !defaultcninetwork {
return fmt.Errorf("Multus: Err in getting k8s network from the pod spec annotation, check the pod spec or set delegate for the default network, Refer the README.md: %v", err)
}
} else if !defaultcninetwork {
return fmt.Errorf("Multus: Err in getting k8s network from pod: %v", err)
}
}
if r != nil && !defaultcninetwork {
return fmt.Errorf("Multus: Err in getting k8s network from pod: %v", r)
}
if len(podDelegate) != 0 {
n.Delegates = podDelegate
}