github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #129644 from neolit123/1.33-update-text-at-end-of-reset

Browse Source 
kubeadm: improve message in 'reset'
This commit is contained in:
Kubernetes Prow Robot 2025-01-18 06:38:41 -08:00 committed by GitHub
commit b92b3d33e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,19 +47,13 @@ import (
) )
var ( var (
iptablesCleanupInstructions = dedent.Dedent(` manualCleanupInstructions = dedent.Dedent(`
The reset process does not reset or clean up iptables rules or IPVS tables. The reset process does not perform cleanup of CNI plugin configuration,
If you wish to reset iptables, you must do so manually by using the "iptables" command. network filtering rules and kubeconfig files.
If your cluster was setup to utilize IPVS, run ipvsadm --clear (or similar) For information on how to perform this cleanup manually, please see:
to reset your system's IPVS tables. https://k8s.io/docs/reference/setup-tools/kubeadm/kubeadm-reset/
The reset process does not clean your kubeconfig files and you must remove them manually.
Please, check the contents of the $HOME/.kube/config file.
`)
cniCleanupInstructions = dedent.Dedent(`
The reset process does not clean CNI configuration. To do so, you must remove /etc/cni/net.d
`) `)
) )
@ -234,10 +228,7 @@ func newCmdReset(in io.Reader, out io.Writer, resetOptions *resetOptions) *cobra
return err return err
} }
// output help text instructing user how to remove cni folders fmt.Print(manualCleanupInstructions)
fmt.Print(cniCleanupInstructions)
// Output help text instructing user how to remove iptables rules
fmt.Print(iptablesCleanupInstructions)
return nil return nil
}, },
} }