Fix boostrap token encoding bug during master init

Currently the boostrap fails when a token is provided by the user on `master init` and works when the token is generated. This is because of a mismatch of how the token string in the kube-discovery secret is encoded.

Fix boostrap token encoding bug during master init
5862ea6f · Atanas Mirchev · Ilya Dmitrichenko · 0a68bb05 · 5862ea6f
Unverified Commit 5862ea6f authored Sep 23, 2016 by Atanas Mirchev Committed by Ilya Dmitrichenko Sep 24, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

discovery.go cmd/kubeadm/app/master/discovery.go +1 -2

No files found.
--- a/cmd/kubeadm/app/master/discovery.go
+++ b/cmd/kubeadm/app/master/discovery.go
@@ -18,7 +18,6 @@ package master

 import (
 	"crypto/x509"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"time"
@@ -52,7 +51,7 @@ func encodeKubeDiscoverySecretData(s *kubeadmapi.KubeadmConfig, caCert *x509.Cer
 		endpointList = append(endpointList, fmt.Sprintf("https://%s:443", addr.String()))
 	}

-	tokenMap[s.Secrets.TokenID] = hex.EncodeToString(s.Secrets.Token)
+	tokenMap[s.Secrets.TokenID] = s.Secrets.BearerToken

 	data["endpoint-list.json"], _ = json.Marshal(endpointList)
 	data["token-map.json"], _ = json.Marshal(tokenMap)