From 69dd248747d6e09ba5ac3c8fa0daaaccc074b2ef Mon Sep 17 00:00:00 2001
From: Derek McQuay <dmcquay@apprenda.com>
Date: Wed, 1 Feb 2017 16:07:30 -0800
Subject: [PATCH] kubeadm: changed error passing to be more clear

updated flag error in discovery/https, discovery/token, and
discovery/file
---
 cmd/kubeadm/app/discovery/file/file.go   | 3 +--
 cmd/kubeadm/app/discovery/flags.go       | 9 ++++++---
 cmd/kubeadm/app/discovery/https/https.go | 3 +--
 cmd/kubeadm/app/discovery/token/token.go | 3 +--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/kubeadm/app/discovery/file/file.go b/cmd/kubeadm/app/discovery/file/file.go
index a68254267b7..1f9fe771054 100644
--- a/cmd/kubeadm/app/discovery/file/file.go
+++ b/cmd/kubeadm/app/discovery/file/file.go
@@ -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
 }
diff --git a/cmd/kubeadm/app/discovery/flags.go b/cmd/kubeadm/app/discovery/flags.go
index e80a97b947d..bde4e4e2b1c 100644
--- a/cmd/kubeadm/app/discovery/flags.go
+++ b/cmd/kubeadm/app/discovery/flags.go
@@ -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")
 	}
diff --git a/cmd/kubeadm/app/discovery/https/https.go b/cmd/kubeadm/app/discovery/https/https.go
index 132f9bd8a4d..d4c9df20061 100644
--- a/cmd/kubeadm/app/discovery/https/https.go
+++ b/cmd/kubeadm/app/discovery/https/https.go
@@ -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
 }
diff --git a/cmd/kubeadm/app/discovery/token/token.go b/cmd/kubeadm/app/discovery/token/token.go
index 1560204f4fc..3f3e62cfcd1 100644
--- a/cmd/kubeadm/app/discovery/token/token.go
+++ b/cmd/kubeadm/app/discovery/token/token.go
@@ -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
 }