github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41838 from apprenda/kubeadm_fixed_token_String

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-23 03:29:35 -08:00 committed by GitHub
commit 52d81606b6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/discovery/flags.go
View File

@ -46,7 +46,7 @@ func (d *discoveryValue) String() string {
case d.v.File != nil: case d.v.File != nil:
return "file://" + d.v.File.Path return "file://" + d.v.File.Path
case d.v.Token != nil: 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: default:
return "unknown" return "unknown"
} }

2
cmd/kubeadm/app/discovery/flags_test.go
View File

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