Skip to content

Commit 72a62c7

Browse files
authored
Merge pull request #39032 from Zhuzhenghao/fix/sync-en
[zh-cn] sync some files with en page.
2 parents eda1e65 + 5691f71 commit 72a62c7

File tree

5 files changed

+27
-16
lines changed

5 files changed

+27
-16
lines changed

content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
title: 检查移除 Dockershim 是否对你有影响
33
content_type: task
4-
weight: 20
4+
weight: 50
55
---
66
<!--
77
title: Check whether dockershim removal affects you
88
content_type: task
99
reviewers:
1010
- SergeyKanzhelev
11-
weight: 20
11+
weight: 50
1212
-->
1313

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

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

137139
<!--

content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
title: 查明节点上所使用的容器运行时
33
content_type: task
4-
weight: 10
4+
weight: 30
55
---
66
<!--
77
title: Find Out What Container Runtime is Used on a Node
88
content_type: task
99
reviewers:
1010
- SergeyKanzhelev
11-
weight: 10
11+
weight: 30
1212
-->
1313

1414
<!-- overview -->
@@ -171,7 +171,7 @@ nodes.
171171
<!--
172172
If you want to change the Container Runtime on a Node from Docker Engine to containerd,
173173
you can find out more information on [migrating from Docker Engine to containerd](/docs/tasks/administer-cluster/migrating-from-dockershim/change-runtime-containerd/),
174-
or, if you want to continue using Docker Engine in v1.24 and later, migrate to a
174+
or, if you want to continue using Docker Engine in Kubernetes v1.24 and later, migrate to a
175175
CRI-compatible adapter like [`cri-dockerd`](https://github.com/Mirantis/cri-dockerd).
176176
-->
177177
如果你将节点上的容器运行时从 Docker Engine 改变为 containerd,可在

content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/migrating-telemetry-and-security-agents.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
---
22
title: 从 dockershim 迁移遥测和安全代理
33
content_type: task
4-
weight: 70
4+
weight: 60
55
---
66
<!--
77
title: Migrating telemetry and security agents from dockershim
88
content_type: task
99
reviewers:
1010
- SergeyKanzhelev
11-
weight: 70
11+
weight: 60
1212
-->
1313

1414
<!-- overview -->
1515

1616
{{% thirdparty-content %}}
1717

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

173+
<!--
174+
## Migration from dockershim
175+
-->
167176
## 从 dockershim 迁移 {#migration-from-dockershim}
168177

169178
### [Aqua](https://www.aquasec.com)

content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: 使用 Romana 提供 NetworkPolicy
33
content_type: task
4-
weight: 40
4+
weight: 50
55
---
66

77
<!--
88
reviewers:
99
- chrismarino
1010
title: Romana for NetworkPolicy
1111
content_type: task
12-
weight: 40
12+
weight: 50
1313
-->
1414

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

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

content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: 使用 Weave Net 提供 NetworkPolicy
33
content_type: task
4-
weight: 50
4+
weight: 60
55
---
66

77
<!--
88
reviewers:
99
- bboreham
1010
title: Weave Net for NetworkPolicy
1111
content_type: task
12-
weight: 50
12+
weight: 60
1313
-->
1414

1515
<!-- overview -->

0 commit comments

Comments
 (0)