github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: improve init token logging.

Browse Source
This commit is contained in:
Paulo Pires 2017-01-17 12:42:06 +00:00
parent 2e8df3b569
commit 6b5d803e8a
No known key found for this signature in database
GPG Key ID: F3F6ED5C522EAA71
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/init.go
View File

@ -203,12 +203,12 @@ func (i *Init) Run(out io.Writer) error {
// Validate token if any, otherwise generate // Validate token if any, otherwise generate
if i.cfg.Discovery.Token != nil { if i.cfg.Discovery.Token != nil {
if i.cfg.Discovery.Token.ID != "" && i.cfg.Discovery.Token.Secret != "" { if i.cfg.Discovery.Token.ID != "" && i.cfg.Discovery.Token.Secret != "" {
fmt.Printf("[token-discovery] A token has been provided, validating [%+v]\n", i.cfg.Discovery.Token) fmt.Printf("[token-discovery] A token has been provided, validating [%s]\n", kubeadmutil.BearerToken(i.cfg.Discovery.Token))
if valid, err := kubeadmutil.ValidateToken(i.cfg.Discovery.Token); valid == false { if valid, err := kubeadmutil.ValidateToken(i.cfg.Discovery.Token); valid == false {
return err return err
} }
} else { } else {
fmt.Printf("[token-discovery] A token has not been provided, generating one\n") fmt.Println("[token-discovery] A token has not been provided, generating one")
if err := kubeadmutil.GenerateToken(i.cfg.Discovery.Token); err != nil { if err := kubeadmutil.GenerateToken(i.cfg.Discovery.Token); err != nil {
return err return err
} }