From 389e065ebc82e4f9469f3948a9fc3d6fcf7a3caa Mon Sep 17 00:00:00 2001 From: Derek McQuay Date: Tue, 21 Feb 2017 13:44:52 -0800 Subject: [PATCH] kubeadm: update token to use '.' in discovery pkg --- cmd/kubeadm/app/discovery/flags.go | 2 +- cmd/kubeadm/app/discovery/flags_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/discovery/flags.go b/cmd/kubeadm/app/discovery/flags.go index bde4e4e2b1c..d0733491eed 100644 --- 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" } diff --git a/cmd/kubeadm/app/discovery/flags_test.go b/cmd/kubeadm/app/discovery/flags_test.go index dddd161d46a..c1d89025f01 100644 --- 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 {