Skip to content

Commit

Permalink
[zh-cn] sync some files with en page.
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhuzhenghao committed Jan 21, 2023
1 parent eda1e65 commit 5691f71
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 16 deletions.
@@ -1,14 +1,14 @@
---
title: 检查移除 Dockershim 是否对你有影响
content_type: task
weight: 20
weight: 50
---
<!--
title: Check whether dockershim removal affects you
content_type: task
reviewers:
- SergeyKanzhelev
weight: 20
weight: 50
-->

<!-- overview -->
Expand Down Expand Up @@ -131,7 +131,9 @@ You can read about it in [Kubernetes Containerd integration goes GA](/blog/2018/
你可以阅读博文
[Kubernetes 正式支持集成 Containerd](/blog/2018/05/24/kubernetes-containerd-integration-goes-ga/)

<!-- Dockershim vs. CRI with Containerd -->
<!--
![Dockershim vs. CRI with Containerd](/images/blog/2018-05-24-kubernetes-containerd-integration-goes-ga/cri-containerd.png)
-->
![Dockershim 和 Containerd CRI 的实现对比图](/images/blog/2018-05-24-kubernetes-containerd-integration-goes-ga/cri-containerd.png)

<!--
Expand Down
@@ -1,14 +1,14 @@
---
title: 查明节点上所使用的容器运行时
content_type: task
weight: 10
weight: 30
---
<!--
title: Find Out What Container Runtime is Used on a Node
content_type: task
reviewers:
- SergeyKanzhelev
weight: 10
weight: 30
-->

<!-- overview -->
Expand Down Expand Up @@ -171,7 +171,7 @@ nodes.
<!--
If you want to change the Container Runtime on a Node from Docker Engine to containerd,
you can find out more information on [migrating from Docker Engine to containerd](/docs/tasks/administer-cluster/migrating-from-dockershim/change-runtime-containerd/),
or, if you want to continue using Docker Engine in v1.24 and later, migrate to a
or, if you want to continue using Docker Engine in Kubernetes v1.24 and later, migrate to a
CRI-compatible adapter like [`cri-dockerd`](https://github.com/Mirantis/cri-dockerd).
-->
如果你将节点上的容器运行时从 Docker Engine 改变为 containerd,可在
Expand Down
@@ -1,22 +1,28 @@
---
title: 从 dockershim 迁移遥测和安全代理
content_type: task
weight: 70
weight: 60
---
<!--
title: Migrating telemetry and security agents from dockershim
content_type: task
reviewers:
- SergeyKanzhelev
weight: 70
weight: 60
-->

<!-- overview -->

{{% thirdparty-content %}}

<!--
Kubernetes' support for direct integration with Docker Engine is deprecated and has been removed. Most apps do not have a direct dependency on runtime hosting containers. However, there are still a lot of telemetry and monitoring agents that has a dependency on docker to collect containers metadata, logs and metrics. This document aggregates information on how to detect these dependencies and links on how to migrate these agents to use generic tools or alternative runtimes.
Kubernetes' support for direct integration with Docker Engine is deprecated and
has been removed. Most apps do not have a direct dependency on runtime hosting
containers. However, there are still a lot of telemetry and monitoring agents
that have a dependency on Docker to collect containers metadata, logs, and
metrics. This document aggregates information on how to detect these
dependencies as well as links on how to migrate these agents to use generic tools or
alternative runtimes.
-->
Kubernetes 对与 Docker Engine 直接集成的支持已被弃用且已经被删除。
大多数应用程序不直接依赖于托管容器的运行时。但是,仍然有大量的遥测和监控代理依赖
Expand Down Expand Up @@ -65,8 +71,8 @@ might run a command such as
[`docker ps`](https://docs.docker.com/engine/reference/commandline/ps/)
or [`docker top`](https://docs.docker.com/engine/reference/commandline/top/) to list
containers and processes or [`docker logs`](https://docs.docker.com/engine/reference/commandline/logs/)
+to receive streamed logs. If nodes in your existing cluster use
+Docker Engine, and you switch to a different container runtime,
to receive streamed logs. If nodes in your existing cluster use
Docker Engine, and you switch to a different container runtime,
these commands will not work any longer.
-->
一些代理和 Docker 工具紧密绑定。比如代理会用到
Expand Down Expand Up @@ -164,6 +170,9 @@ Please contact the vendor to get up to date instructions for migrating from dock
提供了为各类遥测和安全代理供应商准备的持续更新的迁移指导。
请与供应商联系,获取从 dockershim 迁移的最新说明。

<!--
## Migration from dockershim
-->
## 从 dockershim 迁移 {#migration-from-dockershim}

### [Aqua](https://www.aquasec.com)
Expand Down
@@ -1,15 +1,15 @@
---
title: 使用 Romana 提供 NetworkPolicy
content_type: task
weight: 40
weight: 50
---

<!--
reviewers:
- chrismarino
title: Romana for NetworkPolicy
content_type: task
weight: 40
weight: 50
-->

<!-- overview -->
Expand All @@ -22,7 +22,7 @@ This page shows how to use Romana for NetworkPolicy.
## {{% heading "prerequisites" %}}

<!--
Complete steps 1, 2, and 3 of the [kubeadm getting started guide](/docs/getting-started-guides/kubeadm/).
Complete steps 1, 2, and 3 of the [kubeadm getting started guide](/docs/reference/setup-tools/kubeadm/).
-->
完成 [kubeadm 入门指南](/zh-cn/docs/reference/setup-tools/kubeadm/)中的 1、2、3 步。

Expand Down
@@ -1,15 +1,15 @@
---
title: 使用 Weave Net 提供 NetworkPolicy
content_type: task
weight: 50
weight: 60
---

<!--
reviewers:
- bboreham
title: Weave Net for NetworkPolicy
content_type: task
weight: 50
weight: 60
-->

<!-- overview -->
Expand Down

0 comments on commit 5691f71

Please sign in to comment.