diff --git a/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/_index.md b/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/_index.md index f54be498d4..d4a915914b 100644 --- a/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/_index.md +++ b/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/_index.md @@ -16,7 +16,7 @@ installations. Our [Dockershim Removal FAQ](/blog/2022/02/17/dockershim-faq/) is to understand the problem better. Dockershim was removed from Kubernetes with the release of v1.24. -If you use Docker via dockershim as your container runtime, and wish to upgrade to v1.24, +If you use Docker Engine via dockershim as your container runtime, and wish to upgrade to v1.24, it is recommended that you either migrate to another runtime or find an alternative means to obtain Docker Engine support. Check out [container runtimes](/docs/setup/production-environment/container-runtimes/) section to know your options. Make sure to diff --git a/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md b/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md index dbfe02d9e6..c4247f085a 100644 --- a/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md +++ b/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md @@ -41,7 +41,7 @@ node-2 Ready v1.16.15 docker://19.3.1 node-3 Ready v1.16.15 docker://19.3.1 ``` If your runtime shows as Docker Engine, you still might not be affected by the -removal of dockershim in Kubernetes 1.24. [Check the runtime +removal of dockershim in Kubernetes v1.24. [Check the runtime endpoint](#which-endpoint) to see if you use dockershim. If you don't use dockershim, you aren't affected. @@ -64,7 +64,7 @@ The container runtime talks to the kubelet over a Unix socket using the [CRI protocol](/docs/concepts/architecture/cri/), which is based on the gRPC framework. The kubelet acts as a client, and the runtime acts as the server. In some cases, you might find it useful to know which socket your nodes use. For -example, with the removal of dockershim in Kubernetes 1.24 and later, you might +example, with the removal of dockershim in Kubernetes v1.24 and later, you might want to know whether you use Docker Engine with dockershim. {{}} @@ -93,6 +93,7 @@ nodes. name to find out which runtime you use. For example, `unix:///run/containerd/containerd.sock` is the containerd endpoint. -If you use Docker Engine with the dockershim, [migrate to a different runtime](/docs/tasks/administer-cluster/migrating-from-dockershim/change-runtime-containerd/), -or, if you want to continue using Docker Engine in v1.24 and later, migrate to a +If you want to change the Container Runtime on a Node from Docker Engine to containerd, +you can find out more information on [migrating from Docker Engine to containerd](/docs/tasks/administer-cluster/migrating-from-dockershim/change-runtime-containerd/), +or, if you want to continue using Docker Engine in Kubernetes v1.24 and later, migrate to a CRI-compatible adapter like [`cri-dockerd`](https://github.com/Mirantis/cri-dockerd). \ No newline at end of file