kubeadm: changed error passing to be more clear

updated flag error in discovery/https, discovery/token, and
discovery/file
This commit is contained in:
Derek McQuay 2017-02-01 16:07:30 -08:00
parent d06ff13b5a
commit 69dd248747
4 changed files with 9 additions and 9 deletions

View File

@ -22,9 +22,8 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
) )
func Parse(u *url.URL, c *kubeadm.Discovery) error { func Parse(u *url.URL, c *kubeadm.Discovery) {
c.File = &kubeadm.FileDiscovery{ c.File = &kubeadm.FileDiscovery{
Path: u.Path, Path: u.Path,
} }
return nil
} }

View File

@ -72,9 +72,11 @@ func ParseURL(d *kubeadm.Discovery, s string) error {
} }
switch u.Scheme { switch u.Scheme {
case "https": case "https":
return https.Parse(u, d) https.Parse(u, d)
return nil
case "file": case "file":
return file.Parse(u, d) file.Parse(u, d)
return nil
case "token": case "token":
// Make sure a valid RFC 3986 URL has been passed and parsed. // Make sure a valid RFC 3986 URL has been passed and parsed.
// See https://github.com/kubernetes/kubeadm/issues/95#issuecomment-270431296 for more details. // See https://github.com/kubernetes/kubeadm/issues/95#issuecomment-270431296 for more details.
@ -85,7 +87,8 @@ func ParseURL(d *kubeadm.Discovery, s string) error {
return err return err
} }
} }
return token.Parse(u, d) token.Parse(u, d)
return nil
default: default:
return fmt.Errorf("unknown discovery scheme") return fmt.Errorf("unknown discovery scheme")
} }

View File

@ -22,9 +22,8 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
) )
func Parse(u *url.URL, c *kubeadm.Discovery) error { func Parse(u *url.URL, c *kubeadm.Discovery) {
c.HTTPS = &kubeadm.HTTPSDiscovery{ c.HTTPS = &kubeadm.HTTPSDiscovery{
URL: u.String(), URL: u.String(),
} }
return nil
} }

View File

@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
) )
func Parse(u *url.URL, c *kubeadm.Discovery) error { func Parse(u *url.URL, c *kubeadm.Discovery) {
var ( var (
hosts []string hosts []string
tokenID, token string tokenID, token string
@ -42,5 +42,4 @@ func Parse(u *url.URL, c *kubeadm.Discovery) error {
Secret: token, Secret: token,
Addresses: hosts, Addresses: hosts,
} }
return nil
} }