Skip to content

Commit 2657fca

Browse files
authored
Merge pull request #33662 from TinySong/main
update migrating-from-dockershim doc
2 parents 15bacb0 + 1fa24f7 commit 2657fca

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ installations. Our [Dockershim Removal FAQ](/blog/2022/02/17/dockershim-faq/) is
1616
to understand the problem better.
1717

1818
Dockershim was removed from Kubernetes with the release of v1.24.
19-
If you use Docker via dockershim as your container runtime, and wish to upgrade to v1.24,
19+
If you use Docker Engine via dockershim as your container runtime, and wish to upgrade to v1.24,
2020
it is recommended that you either migrate to another runtime or find an alternative means to obtain Docker Engine support.
2121
Check out [container runtimes](/docs/setup/production-environment/container-runtimes/)
2222
section to know your options. Make sure to

content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ node-2 Ready v1.16.15 docker://19.3.1
4141
node-3 Ready v1.16.15 docker://19.3.1
4242
```
4343
If your runtime shows as Docker Engine, you still might not be affected by the
44-
removal of dockershim in Kubernetes 1.24. [Check the runtime
44+
removal of dockershim in Kubernetes v1.24. [Check the runtime
4545
endpoint](#which-endpoint) to see if you use dockershim. If you don't use
4646
dockershim, you aren't affected.
4747

@@ -64,7 +64,7 @@ The container runtime talks to the kubelet over a Unix socket using the [CRI
6464
protocol](/docs/concepts/architecture/cri/), which is based on the gRPC
6565
framework. The kubelet acts as a client, and the runtime acts as the server.
6666
In some cases, you might find it useful to know which socket your nodes use. For
67-
example, with the removal of dockershim in Kubernetes 1.24 and later, you might
67+
example, with the removal of dockershim in Kubernetes v1.24 and later, you might
6868
want to know whether you use Docker Engine with dockershim.
6969

7070
{{<note>}}
@@ -93,6 +93,7 @@ nodes.
9393
name to find out which runtime you use. For example,
9494
`unix:///run/containerd/containerd.sock` is the containerd endpoint.
9595
96-
If you use Docker Engine with the dockershim, [migrate to a different runtime](/docs/tasks/administer-cluster/migrating-from-dockershim/change-runtime-containerd/),
97-
or, if you want to continue using Docker Engine in v1.24 and later, migrate to a
96+
If you want to change the Container Runtime on a Node from Docker Engine to containerd,
97+
you can find out more information on [migrating from Docker Engine to containerd](/docs/tasks/administer-cluster/migrating-from-dockershim/change-runtime-containerd/),
98+
or, if you want to continue using Docker Engine in Kubernetes v1.24 and later, migrate to a
9899
CRI-compatible adapter like [`cri-dockerd`](https://github.com/Mirantis/cri-dockerd).

0 commit comments

Comments
 (0)