Skip to content

Commit 05d16dd

Browse files
authored
Merge pull request #33185 from my-git9/panic-kubernetes-and-docker
[zh] Update 2020-12-02-dont-panic-kubernetes-and-docker.md
2 parents 3c357de + 5a1b3ce commit 05d16dd

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

content/zh/blog/_posts/2020-12-02-dont-panic-kubernetes-and-docker.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ slug: dont-panic-kubernetes-and-docker
1313

1414
**作者:** Jorge Castro, Duffie Cooley, Kat Cosgrove, Justin Garrison, Noah Kantrowitz, Bob Killen, Rey Lejano, Dan “POP” Papandrea, Jeffrey Sica, Davanum “Dims” Srinivas
1515

16+
<!--
17+
_Update: Kubernetes support for Docker via `dockershim` is now deprecated.
18+
For more information, read the [deprecation notice](/blog/2020/12/08/kubernetes-1-20-release-announcement/#dockershim-deprecation).
19+
You can also discuss the deprecation via a dedicated [GitHub issue](https://github.com/kubernetes/kubernetes/issues/106917)._
20+
-->
21+
_更新:Kubernetes 通过 `dockershim` 对 Docker 的支持现已弃用。
22+
有关更多信息,请阅读[弃用通知](/zh/blog/2020/12/08/kubernetes-1-20-release-announcement/#dockershim-deprecation)
23+
你还可以通过专门的 [GitHub issue](https://github.com/kubernetes/kubernetes/issues/106917) 讨论弃用。_
24+
1625
<!--
1726
Kubernetes is [deprecating
1827
Docker](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#deprecation)
@@ -204,7 +213,7 @@ Kubernetes 有很多变化中的功能,没有人是100%的专家。
204213
我们希望这已经回答了你的大部分问题,并缓解了一些焦虑!❤️
205214

206215
<!--
207-
Looking for more answers? Check out our accompanying [Dockershim Deprecation FAQ](/blog/2020/12/02/dockershim-faq/).
216+
Looking for more answers? Check out our accompanying [Dockershim Removal FAQ](/blog/2022/02/17/dockershim-faq/) _(updated February 2022)_.
208217
-->
209218
还在寻求更多答案吗?请参考我们附带的
210-
[弃用 Dockershim 的常见问题](/zh/blog/2020/12/02/dockershim-faq/)
219+
[移除 Dockershim 的常见问题](/zh/blog/2020/12/02/dockershim-faq/) _(2022年2月更新)_

0 commit comments

Comments
 (0)