Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
84e2c636
Commit
84e2c636
authored
Apr 09, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
Apr 09, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #44244 from kargakis/fix-kubeadm-help
Automatic merge from submit-queue kubeadm: grammatical fixes in join help
parents
6e3bd081
267491ef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
join.go
cmd/kubeadm/app/cmd/join.go
+3
-4
No files found.
cmd/kubeadm/app/cmd/join.go
View file @
84e2c636
...
@@ -73,7 +73,7 @@ func NewCmdJoin(out io.Writer) *cobra.Command {
...
@@ -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 {
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment