github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79648 from tnqn/kubeadm

Browse Source 
Fix descriptions of kubeadm
This commit is contained in:
Kubernetes Prow Robot 2019-07-04 09:38:38 -07:00 committed by GitHub
commit 2aacecb8d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go
View File

@ -31,7 +31,7 @@ import (
var ( var (
bootstrapTokenLongDesc = cmdutil.LongDesc(` bootstrapTokenLongDesc = cmdutil.LongDesc(`
Bootstrap tokens are used for establishing bidirectional trust between a node joining Bootstrap tokens are used for establishing bidirectional trust between a node joining
the cluster and a the control-plane node. the cluster and a control-plane node.
This command makes all the configurations required to make bootstrap tokens works This command makes all the configurations required to make bootstrap tokens works
and then creates an initial token. and then creates an initial token.

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

@ -42,9 +42,7 @@ import (
var ( var (
iptablesCleanupInstructions = dedent.Dedent(` iptablesCleanupInstructions = dedent.Dedent(`
The reset process does not reset or clean up iptables rules or IPVS tables. The reset process does not reset or clean up iptables rules or IPVS tables.
If you wish to reset iptables, you must do so manually. If you wish to reset iptables, you must do so manually by using the "iptables" command.
For example:
iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X
If your cluster was setup to utilize IPVS, run ipvsadm --clear (or similar) If your cluster was setup to utilize IPVS, run ipvsadm --clear (or similar)
to reset your system's IPVS tables. to reset your system's IPVS tables.