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

Merge pull request #70874 from rdodev/reset-iptables 

iptables reset text message
pull/58/head
k8s-ci-robot 2018-11-13 16:14:04 -08:00 committed by GitHub
parent a04e854428 89a5d5cadd
commit 8d27e5683c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,7 @@ func (r *Reset) Run(out io.Writer, client clientset.Interface) error {
if err := removeContainers(utilsexec.New(), r.criSocketPath); err != nil {
klog.Errorf("[reset] failed to remove containers: %+v", err)
}
dirsToClean = append(dirsToClean, []string{kubeadmconstants.KubeletRunDirectory, "/etc/cni/net.d", "/var/lib/dockershim", "/var/run/kubernetes"}...)
// Then clean contents from the stateful kubelet, etcd and cni directories
@ -184,6 +185,18 @@ func (r *Reset) Run(out io.Writer, client clientset.Interface) error {
}
resetConfigDir(kubeadmconstants.KubernetesDir, r.certsDir)
// Output help text instructing user how to remove iptables rules
msg := `
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 your cluster was setup to utilize IPVS, run ipvsadm --clear (or similar)
to reset your system's IPVS tables.
`
fmt.Print(msg)
return nil
}