diff --git a/content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md b/content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md index 09541e7033199..3a9b66d4963ea 100644 --- a/content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md +++ b/content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md @@ -1,14 +1,14 @@ --- title: 检查移除 Dockershim 是否对你有影响 content_type: task -weight: 20 +weight: 50 --- @@ -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 和 Containerd CRI 的实现对比图](/images/blog/2018-05-24-kubernetes-containerd-integration-goes-ga/cri-containerd.png) @@ -171,7 +171,7 @@ nodes. 如果你将节点上的容器运行时从 Docker Engine 改变为 containerd,可在 diff --git a/content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/migrating-telemetry-and-security-agents.md b/content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/migrating-telemetry-and-security-agents.md index 6a5bf88d52df8..8ebb3bdc69542 100644 --- a/content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/migrating-telemetry-and-security-agents.md +++ b/content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/migrating-telemetry-and-security-agents.md @@ -1,14 +1,14 @@ --- title: 从 dockershim 迁移遥测和安全代理 content_type: task -weight: 70 +weight: 60 --- @@ -16,7 +16,13 @@ weight: 70 {{% thirdparty-content %}} Kubernetes 对与 Docker Engine 直接集成的支持已被弃用且已经被删除。 大多数应用程序不直接依赖于托管容器的运行时。但是,仍然有大量的遥测和监控代理依赖 @@ -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 工具紧密绑定。比如代理会用到 @@ -164,6 +170,9 @@ Please contact the vendor to get up to date instructions for migrating from dock 提供了为各类遥测和安全代理供应商准备的持续更新的迁移指导。 请与供应商联系,获取从 dockershim 迁移的最新说明。 + ## 从 dockershim 迁移 {#migration-from-dockershim} ### [Aqua](https://www.aquasec.com) diff --git a/content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy.md b/content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy.md index 6331be657247f..440f1a7f8829f 100644 --- a/content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy.md +++ b/content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy.md @@ -1,7 +1,7 @@ --- title: 使用 Romana 提供 NetworkPolicy content_type: task -weight: 40 +weight: 50 --- @@ -22,7 +22,7 @@ This page shows how to use Romana for NetworkPolicy. ## {{% heading "prerequisites" %}} 完成 [kubeadm 入门指南](/zh-cn/docs/reference/setup-tools/kubeadm/)中的 1、2、3 步。 diff --git a/content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md b/content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md index d27f901ff1f34..283fe06305abc 100644 --- a/content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md +++ b/content/zh-cn/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md @@ -1,7 +1,7 @@ --- title: 使用 Weave Net 提供 NetworkPolicy content_type: task -weight: 50 +weight: 60 ---