@@ -47,19 +47,13 @@ import (
47
47
)
48
48
49
49
var (
50
- iptablesCleanupInstructions = dedent .Dedent (`
51
- The reset process does not reset or clean up iptables rules or IPVS tables.
52
- If you wish to reset iptables, you must do so manually by using the "iptables" command .
50
+ manualCleanupInstructions = dedent .Dedent (`
51
+ The reset process does not perform cleanup of CNI plugin configuration,
52
+ network filtering rules and kubeconfig files .
53
53
54
- If your cluster was setup to utilize IPVS, run ipvsadm --clear (or similar)
55
- to reset your system's IPVS tables.
54
+ For information on how to perform this cleanup manually, please see:
55
+ https://k8s.io/docs/reference/setup-tools/kubeadm/kubeadm-reset/
56
56
57
- The reset process does not clean your kubeconfig files and you must remove them manually.
58
- Please, check the contents of the $HOME/.kube/config file.
59
- ` )
60
-
61
- cniCleanupInstructions = dedent .Dedent (`
62
- The reset process does not clean CNI configuration. To do so, you must remove /etc/cni/net.d
63
57
` )
64
58
)
65
59
@@ -234,10 +228,7 @@ func newCmdReset(in io.Reader, out io.Writer, resetOptions *resetOptions) *cobra
234
228
return err
235
229
}
236
230
237
- // output help text instructing user how to remove cni folders
238
- fmt .Print (cniCleanupInstructions )
239
- // Output help text instructing user how to remove iptables rules
240
- fmt .Print (iptablesCleanupInstructions )
231
+ fmt .Print (manualCleanupInstructions )
241
232
return nil
242
233
},
243
234
}
0 commit comments