Merge pull request #41838 from apprenda/kubeadm_fixed_token_String

Automatic merge from submit-queue (batch tested with PRs 41540, 41808, 41710, 41838, 41840) kubeadm: update token to use '.' in discovery pkg **What this PR does / why we need it**: While working on getting https://github.com/kubernetes/community/pull/381 implemented, I noticed the kubeadm discovery pkg was printing out tokens incorrectly. Corrected and fixed up corresponding test. **Special notes for your reviewer**: /cc @luxas @jbeda **Release note**: ```release-note NONE ```

Merge pull request #41838 from apprenda/kubeadm_fixed_token_String
52d81606 · Kubernetes Submit Queue · GitHub · d81ba2c6 · 389e065e · 52d81606
Commit 52d81606 authored Feb 23, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

flags.go cmd/kubeadm/app/discovery/flags.go +1 -1

flags_test.go cmd/kubeadm/app/discovery/flags_test.go +1 -1

No files found.
--- a/cmd/kubeadm/app/discovery/flags.go
+++ b/cmd/kubeadm/app/discovery/flags.go
@@ -46,7 +46,7 @@ func (d *discoveryValue) String() string {
 	case d.v.File != nil:
 		return "file://" + d.v.File.Path
 	case d.v.Token != nil:
-		return fmt.Sprintf("token://%s:%s@%s", d.v.Token.ID, d.v.Token.Secret, strings.Join(d.v.Token.Addresses, ","))
+		return fmt.Sprintf("token://%s.%s@%s", d.v.Token.ID, d.v.Token.Secret, strings.Join(d.v.Token.Addresses, ","))
 	default:
 		return "unknown"
 	}

--- a/cmd/kubeadm/app/discovery/flags_test.go
+++ b/cmd/kubeadm/app/discovery/flags_test.go
@@ -60,7 +60,7 @@ func TestNewDiscoveryValue(t *testing.T) {
 						Addresses: []string{"foobar"},
 					},
 				},
-			}, expect: "token://foo:bar@foobar",
+			}, expect: "token://foo.bar@foobar",
 		},
 	}
 	for _, rt := range tests {