Skip to content

Commit

Permalink
Fix translation (#28260)
Browse files Browse the repository at this point in the history
* modify posts

* modify md file

* add to markdown file

* modify transilation
  • Loading branch information
jwz-ecust committed Jun 4, 2021
1 parent 8dfb6f9 commit dce880d
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
Expand Up @@ -164,7 +164,7 @@ Notes from meeting:
3\. Brian Grant:

* 测试 v1beta3,准备进入。
* Paul 力于改变命令行的内容
* Paul 致力于改变命令行的内容
* 下周初至中旬,尝试默认启用v1beta3 ?
* 对于任何其他更改,请发出文件并抄送 thockin。

Expand Down
Expand Up @@ -16,7 +16,7 @@ url: /blog/2015/03/Welcome-To-Kubernetes-Blog
<!--
Welcome to the new Kubernetes Blog. Follow this blog to learn about the Kubernetes Open Source project. We plan to post release notes, how-to articles, events, and maybe even some off topic fun here from time to time.
-->
欢迎来到新的 Kubernetes 博客。关注此博客,了解 Kubernetes 开源项目。我们计划不时发布发布说明,操作方法文章,活动,甚至一些非常有趣的话题。
欢迎来到新的 Kubernetes 博客。关注此博客,了解 Kubernetes 开源项目。我们计划时不时的发布发布说明,操作方法文章,活动,甚至一些非常有趣的话题。

<!--
If you are using Kubernetes or contributing to the project and would like to do a guest post, [please let me know](mailto:kitm@google.com).
Expand Down
Expand Up @@ -49,7 +49,7 @@ Docker 的网络模型做出了许多对 Kubernetes 无效的假设。在 docker

<!-- On the other hand, CNI is more philosophically aligned with Kubernetes. It's far simpler than CNM, doesn't require daemons, and is at least plausibly cross-platform (CoreOS’s [rkt](https://coreos.com/rkt/docs/) container runtime supports it). Being cross-platform means that there is a chance to enable network configurations which will work the same across runtimes (e.g. Docker, Rocket, Hyper). It follows the UNIX philosophy of doing one thing well. -->

另一方面, CNI 在哲学上与 Kubernetes 更加一致。它比 CNM 简单得多,不需要守护进程,并且至少是合理的跨平台( CoreOS 的 [rkt](https://coreos.com/rkt/docs/) 容器运行时支持它)。跨平台意味着有机会启用跨运行时(例如 Docker , Rocket , Hyper )运行相同的网络配置。 它遵循 UNIX 的理念,即做好一件事。
另一方面, CNI 在哲学上与 Kubernetes 更加一致。它比 CNM 简单得多,不需要守护进程,并且至少有合理的跨平台( CoreOS 的 [rkt](https://coreos.com/rkt/docs/) 容器运行时支持它)。跨平台意味着有机会启用跨运行时(例如 Docker , Rocket , Hyper )运行相同的网络配置。 它遵循 UNIX 的理念,即做好一件事。

<!-- Additionally, it's trivial to wrap a CNI plugin and produce a more customized CNI plugin — it can be done with a simple shell script. CNM is much more complex in this regard. This makes CNI an attractive option for rapid development and iteration. Early prototypes have proven that it's possible to eject almost 100% of the currently hard-coded network logic in kubelet into a plugin. -->

Expand Down
2 changes: 1 addition & 1 deletion content/zh/blog/_posts/2020-12-02-dockershim-faq.md
Expand Up @@ -83,7 +83,7 @@ and other ecosystem groups to ensure a smooth transition and will evaluate thing
as the situation evolves.
-->
考虑到此改变带来的影响,我们使用了一个加长的废弃时间表。
在 Kubernetes 1.22 版之前,它不会被彻底移除;换句话说,dockershim 被移除的最早版本会是 2021 年底发布 1.23 版。
在 Kubernetes 1.22 版之前,它不会被彻底移除;换句话说,dockershim 被移除的最早版本会是 2021 年底发布的 1.23 版。
我们将与供应商以及其他生态团队紧密合作,确保顺利过渡,并将依据事态的发展评估后续事项。

<!--
Expand Down
Expand Up @@ -32,7 +32,7 @@ that use the [Container Runtime Interface (CRI)](https://kubernetes.io/blog/2016
created for Kubernetes. Docker-produced images will continue to work in your
cluster with all runtimes, as they always have.
-->
弃用 Docker 这个底层运行时,转而支持符合为 Kubernetes 创建的
弃用 Docker 这个底层运行时,转而支持符合为 Kubernetes 创建的容器运行接口
[Container Runtime Interface (CRI)](https://kubernetes.io/blog/2016/12/container-runtime-interface-cri-in-kubernetes/)
的运行时。
Docker 构建的镜像,将在你的集群的所有运行时中继续工作,一如既往。
Expand Down
2 changes: 1 addition & 1 deletion content/zh/docs/concepts/architecture/cloud-controller.md
Expand Up @@ -56,7 +56,7 @@ You can also run the cloud controller manager as a Kubernetes
of the control plane.
-->
{{< note >}}
你也可以以 Kubernetes {{< glossary_tooltip text="插件" term_id="addons" >}}
你也可以用 Kubernetes {{< glossary_tooltip text="插件" term_id="addons" >}}
的形式而不是控制面中的一部分来运行云控制器管理器。
{{< /note >}}

Expand Down

0 comments on commit dce880d

Please sign in to comment.