Merge pull request kubernetes#49711 from windsonsea/stacks

Clean up two pages for migrating-from-dockershim

content/en/docs/tasks/administer-cluster/migrating-from-dockershim/_index.md

@@ -35,7 +35,6 @@ configuration.
 These tasks will help you to migrate:
 
 * [Check whether Dockershim removal affects you](/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you/)
-* [Migrate Docker Engine nodes from dockershim to cri-dockerd](/docs/tasks/administer-cluster/migrating-from-dockershim/migrate-dockershim-dockerd/)
 * [Migrating telemetry and security agents from dockershim](/docs/tasks/administer-cluster/migrating-from-dockershim/migrating-telemetry-and-security-agents/)
 
 

content/en/docs/tasks/administer-cluster/migrating-from-dockershim/troubleshooting-cni-plugin-related-errors.md

@@ -17,7 +17,8 @@ Kubernetes.
 
 Service issues exist for pod CNI network setup and tear down in containerd
 v1.6.0-v1.6.3 when the CNI plugins have not been upgraded and/or the CNI config
-version is not declared in the CNI config files. The containerd team reports, "these issues are resolved in containerd v1.6.4."
+version is not declared in the CNI config files. The containerd team reports,
+"these issues are resolved in containerd v1.6.4."
 
 With containerd v1.6.0-v1.6.3, if you do not upgrade the CNI plugins and/or
 declare the CNI config version, you might encounter the following "Incompatible
@@ -59,23 +60,23 @@ your CNI plugins and editing the CNI config files.
 
 Here's an overview of the typical steps for each node:
 
-1. [Safely drain and cordon the
-node](/docs/tasks/administer-cluster/safely-drain-node/).
-2. After stopping your container runtime and kubelet services, perform the
-following upgrade operations:
-  - If you're running CNI plugins, upgrade them to the latest version.
-  - If you're using non-CNI plugins, replace them with CNI plugins. Use the
-  latest version of the plugins.
-  - Update the plugin configuration file to specify or match a version of the
-  CNI specification that the plugin supports, as shown in the following ["An
-  example containerd configuration
-  file"](#an-example-containerd-configuration-file) section.
-  - For `containerd`, ensure that you have installed the latest version (v1.0.0
-  or later) of the CNI loopback plugin.
-  - Upgrade node components (for example, the kubelet) to Kubernetes v1.24
-  - Upgrade to or install the most current version of the container runtime.
-3. Bring the node back into your cluster by restarting your container runtime
-and kubelet. Uncordon the node (`kubectl uncordon <nodename>`).
+1. [Safely drain and cordon the node](/docs/tasks/administer-cluster/safely-drain-node/).
+1. After stopping your container runtime and kubelet services, perform the
+   following upgrade operations:
+
+   - If you're running CNI plugins, upgrade them to the latest version.
+   - If you're using non-CNI plugins, replace them with CNI plugins. Use the
+     latest version of the plugins.
+   - Update the plugin configuration file to specify or match a version of the
+     CNI specification that the plugin supports, as shown in the following
+     ["An example containerd configuration file"](#an-example-containerd-configuration-file) section.
+   - For `containerd`, ensure that you have installed the latest version (v1.0.0 or later)
+     of the CNI loopback plugin.
+   - Upgrade node components (for example, the kubelet) to Kubernetes v1.24
+   - Upgrade to or install the most current version of the container runtime.
+
+1. Bring the node back into your cluster by restarting your container runtime
+   and kubelet. Uncordon the node (`kubectl uncordon <nodename>`).
 
 ## An example containerd configuration file