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

8
k8sclient/k8sclient.go
View File

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