mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 23:37:01 +00:00
kubeadm: changed error passing to be more clear
updated flag error in discovery/https, discovery/token, and discovery/file
This commit is contained in:
parent
d06ff13b5a
commit
69dd248747
@ -22,9 +22,8 @@ import (
|
||||
"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{
|
||||
Path: u.Path,
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
@ -72,9 +72,11 @@ func ParseURL(d *kubeadm.Discovery, s string) error {
|
||||
}
|
||||
switch u.Scheme {
|
||||
case "https":
|
||||
return https.Parse(u, d)
|
||||
https.Parse(u, d)
|
||||
return nil
|
||||
case "file":
|
||||
return file.Parse(u, d)
|
||||
file.Parse(u, d)
|
||||
return nil
|
||||
case "token":
|
||||
// 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.
|
||||
@ -85,7 +87,8 @@ func ParseURL(d *kubeadm.Discovery, s string) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return token.Parse(u, d)
|
||||
token.Parse(u, d)
|
||||
return nil
|
||||
default:
|
||||
return fmt.Errorf("unknown discovery scheme")
|
||||
}
|
||||
|
@ -22,9 +22,8 @@ import (
|
||||
"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{
|
||||
URL: u.String(),
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
@ -23,7 +23,7 @@ import (
|
||||
"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 (
|
||||
hosts []string
|
||||
tokenID, token string
|
||||
@ -42,5 +42,4 @@ func Parse(u *url.URL, c *kubeadm.Discovery) error {
|
||||
Secret: token,
|
||||
Addresses: hosts,
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user