github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: grammatical fixes in join help

Browse Source 
Signed-off-by: Michail Kargakis <mkargaki@redhat.com>
This commit is contained in:
Michail Kargakis 2017-04-08 01:05:11 +02:00
parent 98a4c6ba7f
commit 267491efb9
No known key found for this signature in database
GPG Key ID: EA0DEBF5DFA276E0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kubeadm/app/cmd/join.go
View File

@ -73,7 +73,7 @@ func NewCmdJoin(out io.Writer) *cobra.Command {
provide a file (a subset of the standard kubeconfig file). This file provide a file (a subset of the standard kubeconfig file). This file
can be a local file or downloaded via an HTTPS URL. The forms are can be a local file or downloaded via an HTTPS URL. The forms are
kubeadm join --discovery-token abcdef.1234567890abcdef 1.2.3.4:6443, kubeadm join --discovery-token abcdef.1234567890abcdef 1.2.3.4:6443,
kubeadm join --discovery-file path/to/file.conf or kubeadm join kubeadm join --discovery-file path/to/file.conf, or kubeadm join
--discovery-file https://url/file.conf. Only one form can be used. If --discovery-file https://url/file.conf. Only one form can be used. If
the discovery information is loaded from a URL, HTTPS must be used and the discovery information is loaded from a URL, HTTPS must be used and
the host installed CA bundle is used to verify the connection. the host installed CA bundle is used to verify the connection.
@ -85,9 +85,8 @@ func NewCmdJoin(out io.Writer) *cobra.Command {
approve these signing requests. This token is passed in with the approve these signing requests. This token is passed in with the
--tls-bootstrap-token abcdef.1234567890abcdef flag. --tls-bootstrap-token abcdef.1234567890abcdef flag.
Often times the same token is use for both parts. In this case, the Often times the same token is used for both parts. In this case, the
--token flag can be used instead of specifying the each token --token flag can be used instead of specifying each token individually.
individually.
`), `),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
cfg.DiscoveryTokenAPIServers = args cfg.DiscoveryTokenAPIServers = args