Skip to content

Commit 1646156

Browse files
authored
Merge pull request #29780 from reylejano/issue-29776
Update kep link and release version for dockershim removal in faq
2 parents 36bd261 + 54bb13c commit 1646156

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

content/en/blog/_posts/2020-12-02-dockershim-faq.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ as cgroups v2 and user namespaces are being implemented in these newer CRI
2828
runtimes. Removing support for the dockershim will allow further development in
2929
those areas.
3030

31-
[drkep]: https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/1985-remove-dockershim
31+
[drkep]: https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/2221-remove-dockershim
3232

3333
### Can I still use Docker in Kubernetes 1.20?
3434

@@ -42,9 +42,11 @@ startup if using Docker as the runtime.
4242

4343
Given the impact of this change, we are using an extended deprecation timeline.
4444
It will not be removed before Kubernetes 1.22, meaning the earliest release without
45-
dockershim would be 1.23 in late 2021. We will be working closely with vendors
46-
and other ecosystem groups to ensure a smooth transition and will evaluate things
47-
as the situation evolves.
45+
dockershim would be 1.23 in late 2021.
46+
_Update_: removal of dockershim is scheduled for Kubernetes v1.24, see
47+
[Dockershim Removal Kubernetes Enhancement Proposal][drkep].
48+
We will be working closely with vendors and other ecosystem groups to ensure a smooth transition and will evaluate
49+
things as the situation evolves.
4850

4951

5052
### Can I still use dockershim after it is removed from Kubernetes?

0 commit comments

Comments
 (0)