Merge pull request #63623 from neolit123/init-token-info

Automatic merge from submit-queue (batch tested with PRs 60200, 63623, 63406). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm-init: add details about --token **What this PR does / why we need it**: Add details about the required format when passing a bootstrap token using 'kubeadm init --token'. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes kubernetes/kubeadm#768 **Special notes for your reviewer**: NONE **Release note**: ```release-note NONE ```

Merge pull request #63623 from neolit123/init-token-info
c20a09dc · Kubernetes Submit Queue · GitHub · 9dcbdc3d · 9bb0fdc7 · c20a09dc
Unverified Commit c20a09dc authored May 10, 2018 by Kubernetes Submit Queue Committed by GitHub May 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

init.go cmd/kubeadm/app/cmd/init.go +1 -1

No files found.
--- a/cmd/kubeadm/app/cmd/init.go
+++ b/cmd/kubeadm/app/cmd/init.go
@@ -187,7 +187,7 @@ func AddInitConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiext.MasterConfigur
 	)
 	flagSet.StringVar(
 		&cfg.Token, "token", cfg.Token,
-		"The token to use for establishing bidirectional trust between nodes and masters.",
+		"The token to use for establishing bidirectional trust between nodes and masters. The format is [a-z0-9]{6}\\.[a-z0-9]{16} - e.g. abcdef.0123456789abcdef",
 	)
 	flagSet.DurationVar(
 		&cfg.TokenTTL.Duration, "token-ttl", cfg.TokenTTL.Duration,