github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #72802 from foxyriver/dedent 

format help text
pull/564/head
Kubernetes Prow Robot 2019-01-11 23:14:59 -08:00 committed by GitHub
parent 5fa52d6d70 b02e1e17ec
commit 23315c8192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/renstrom/dedent"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
@ -186,7 +187,7 @@ func (r *Reset) Run(out io.Writer, client clientset.Interface) error {
resetConfigDir(kubeadmconstants.KubernetesDir, r.certsDir) resetConfigDir(kubeadmconstants.KubernetesDir, r.certsDir)
// Output help text instructing user how to remove iptables rules // Output help text instructing user how to remove iptables rules
msg := ` msg := 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.
For example: For example:
@ -195,7 +196,7 @@ 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.
` `)
fmt.Print(msg) fmt.Print(msg)
return nil return nil