From c272bc56b1545fbe83e31683b313ef3894eb3262 Mon Sep 17 00:00:00 2001
From: Paulo Pires <pires@apprenda.com>
Date: Fri, 6 Jan 2017 12:09:50 +0000
Subject: [PATCH] kubeadm: flag token discovery pieces to be refactored.

---
 cmd/kubeadm/app/discovery/discovery.go | 9 +++++++++
 cmd/kubeadm/app/node/csr.go            | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cmd/kubeadm/app/discovery/discovery.go b/cmd/kubeadm/app/discovery/discovery.go
index 76842e8aadc..a981c41dae0 100644
--- a/cmd/kubeadm/app/discovery/discovery.go
+++ b/cmd/kubeadm/app/discovery/discovery.go
@@ -22,6 +22,7 @@ import (
 	"net/http"
 
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
+
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 )
@@ -33,6 +34,9 @@ func For(d kubeadmapi.Discovery) (*clientcmdapi.Config, error) {
 		return runFileDiscovery(d.File)
 	case d.HTTPS != nil:
 		return runHTTPSDiscovery(d.HTTPS)
+	case d.Token != nil:
+		// TODO move token discovery here
+		return runTokenDiscovery(d.Token)
 	default:
 		return nil, fmt.Errorf("Couldn't find a valid discovery configuration. Please provide one.")
 	}
@@ -58,4 +62,9 @@ func runHTTPSDiscovery(hd *kubeadmapi.HTTPSDiscovery) (*clientcmdapi.Config, err
 
 	return clientcmd.Load(kubeconfig)
 }
+
+// TODO implement
+// runTokenDiscovery executes token-based discovery.
+func runTokenDiscovery(td *kubeadmapi.TokenDiscovery) (*clientcmdapi.Config, error) {
+	return nil, fmt.Errorf("Couldn't find a valid discovery configuration. Please provide one.")
 }
diff --git a/cmd/kubeadm/app/node/csr.go b/cmd/kubeadm/app/node/csr.go
index 9c279e11c82..883ba34568c 100644
--- a/cmd/kubeadm/app/node/csr.go
+++ b/cmd/kubeadm/app/node/csr.go
@@ -29,12 +29,13 @@ import (
 	certutil "k8s.io/kubernetes/pkg/util/cert"
 )
 
+// TODO @mikedanese move this to PerformTLSBootstrap
 func PerformTLSBootstrapDeprecated(connection *ConnectionDetails) (*clientcmdapi.Config, error) {
 	fmt.Println("[csr] Created API client to obtain unique certificate for this node, generating keys and certificate signing request")
 
 	key, err := certutil.MakeEllipticPrivateKeyPEM()
 	if err != nil {
-		return nil, fmt.Errorf("failed to generating private key [%v]", err)
+		return nil, fmt.Errorf("failed to generate private key [%v]", err)
 	}
 	cert, err := csr.RequestNodeCertificate(connection.CertClient.CertificateSigningRequests(), key, connection.NodeName)
 	if err != nil {
@@ -80,7 +81,7 @@ func PerformTLSBootstrap(cfg *clientcmdapi.Config) error {
 
 	key, err := certutil.MakeEllipticPrivateKeyPEM()
 	if err != nil {
-		return fmt.Errorf("failed to generating private key [%v]", err)
+		return fmt.Errorf("failed to generate private key [%v]", err)
 	}
 	cert, err := csr.RequestNodeCertificate(c.Certificates().CertificateSigningRequests(), key, name)
 	if err != nil {