From 0d732009cc75f8333ad131f58dbcd6535c11ca3a Mon Sep 17 00:00:00 2001 From: Quan Tian Date: Tue, 2 Jul 2019 03:25:35 -0700 Subject: [PATCH] Fix descriptions of kubeadm * Remove the example iptables cmd that potentially kills rules that user may be relying on * Fixed a typo in description of phase bootstrap-token --- cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go | 2 +- cmd/kubeadm/app/cmd/reset.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go b/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go index f92ff70b2db..bdfcabb2b7f 100644 --- a/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go +++ b/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go @@ -31,7 +31,7 @@ import ( var ( bootstrapTokenLongDesc = cmdutil.LongDesc(` 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 and then creates an initial token. diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go index 2177c3b29b4..b7ee292e0bf 100644 --- a/cmd/kubeadm/app/cmd/reset.go +++ b/cmd/kubeadm/app/cmd/reset.go @@ -42,9 +42,7 @@ import ( var ( iptablesCleanupInstructions = dedent.Dedent(` 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. - For example: - iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X + If you wish to reset iptables, you must do so manually by using the "iptables" command. If your cluster was setup to utilize IPVS, run ipvsadm --clear (or similar) to reset your system's IPVS tables.