Skip to content

Commit 3f53f16

Browse files
authored
Merge pull request #29796 from mengjiao-liu/update_dockershim_removal
[zh] Update kep link and release version for dockershim removal in faq
2 parents 52f0a16 + d8245b9 commit 3f53f16

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can read more about the community discussion and planning in the
4545
-->
4646
Dockershim 向来都是一个临时解决方案(因此得名:shim)。
4747
你可以进一步阅读
48-
[移除 Kubernetes 增强方案 Dockershim](https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/1985-remove-dockershim)
48+
[移除 Kubernetes 增强方案 Dockershim][drkep]
4949
以了解相关的社区讨论和计划。
5050

5151
<!--
@@ -57,6 +57,7 @@ those areas.
5757
此外,与 dockershim 不兼容的一些特性,例如:控制组(cgoups)v2 和用户名字空间(user namespace),已经在新的 CRI 运行时中被实现。
5858
移除对 dockershim 的支持将加速这些领域的发展。
5959

60+
[drkep]: https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/2221-remove-dockershim
6061
<!--
6162
### Can I still use Docker in Kubernetes 1.20?
6263
-->
@@ -78,12 +79,16 @@ startup if using Docker as the runtime.
7879
<!--
7980
Given the impact of this change, we are using an extended deprecation timeline.
8081
It will not be removed before Kubernetes 1.22, meaning the earliest release without
81-
dockershim would be 1.23 in late 2021. We will be working closely with vendors
82-
and other ecosystem groups to ensure a smooth transition and will evaluate things
83-
as the situation evolves.
82+
dockershim would be 1.23 in late 2021.
83+
_Update_: removal of dockershim is scheduled for Kubernetes v1.24, see
84+
[Dockershim Removal Kubernetes Enhancement Proposal][drkep].
85+
We will be working closely with vendors and other ecosystem groups to ensure a smooth transition and will evaluate
86+
things as the situation evolves.
8487
-->
8588
考虑到此改变带来的影响,我们使用了一个加长的废弃时间表。
8689
在 Kubernetes 1.22 版之前,它不会被彻底移除;换句话说,dockershim 被移除的最早版本会是 2021 年底发布的 1.23 版。
90+
_更新_:dockershim 计划在 Kubernetes 1.24 版被移除,
91+
请参阅[移除 Kubernetes 增强方案 Dockershim][drkep]
8792
我们将与供应商以及其他生态团队紧密合作,确保顺利过渡,并将依据事态的发展评估后续事项。
8893

8994
<!--

0 commit comments

Comments
 (0)