Skip to content

Commit 8b72e69

Browse files
committed
[zh] Resync cluster-administration concepts
1 parent 6b1a95f commit 8b72e69

File tree

3 files changed

+45
-15
lines changed

3 files changed

+45
-15
lines changed

content/zh-cn/docs/concepts/cluster-administration/_index.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ content_type: concept
55
description: >
66
关于创建和管理 Kubernetes 集群的底层细节。
77
no_list: true
8+
card:
9+
name: setup
10+
weight: 60
11+
anchors:
12+
- anchor: "#securing-a-cluster"
13+
title: 保护集群
814
---
915
<!--
1016
title: Cluster Administration
@@ -16,6 +22,12 @@ content_type: concept
1622
description: >
1723
Lower-level detail relevant to creating or administering a Kubernetes cluster.
1824
no_list: true
25+
card:
26+
name: setup
27+
weight: 60
28+
anchors:
29+
- anchor: "#securing-a-cluster"
30+
title: Securing a cluster
1931
-->
2032

2133
<!-- overview -->

content/zh-cn/docs/concepts/cluster-administration/networking.md

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,29 +57,40 @@ Kubernetes 的宗旨就是在应用之间共享机器。
5757
与其去解决这些问题,Kubernetes 选择了其他不同的方法。
5858

5959
要了解 Kubernetes 网络模型,请参阅[此处](/zh-cn/docs/concepts/services-networking/)
60+
6061
<!--
6162
## How to implement the Kubernetes network model
6263
63-
The network model is implemented by the container runtime on each node. The most common container runtimes use [Container Network Interface](https://github.com/containernetworking/cni) (CNI) plugins to manage their network and security capabilities. Many different CNI plugins exist from many different vendors. Some of these provide only basic features of adding and removing network interfaces, while others provide more sophisticated solutions, such as integration with other container orchestration systems, running multiple CNI plugins, advanced IPAM features etc.
64-
65-
See [this page](/docs/concepts/cluster-administration/addons/#networking-and-network-policy) for a non-exhaustive list of networking addons supported by Kubernetes.
64+
The network model is implemented by the container runtime on each node. The most common container
65+
runtimes use [Container Network Interface](https://github.com/containernetworking/cni) (CNI)
66+
plugins to manage their network and security capabilities. Many different CNI plugins exist from
67+
many different vendors. Some of these provide only basic features of adding and removing network
68+
interfaces, while others provide more sophisticated solutions, such as integration with other
69+
container orchestration systems, running multiple CNI plugins, advanced IPAM features etc.
6670
-->
6771
## 如何实现 Kubernetes 的网络模型 {#how-to-implement-the-kubernetes-network-model}
6872

69-
网络模型由每个节点上的容器运行时实现。最常见的容器运行时使用
70-
[Container Network Interface](https://github.com/containernetworking/cni) (CNI) 插件来管理其网络和安全功能
71-
许多不同的 CNI 插件来自于许多不同的供应商。其中一些仅提供添加和删除网络接口的基本功能,
73+
网络模型由各节点上的容器运行时来实现。最常见的容器运行时使用
74+
[Container Network Interface](https://github.com/containernetworking/cni) (CNI) 插件来管理其网络和安全能力
75+
来自不同供应商 CNI 插件有很多。其中一些仅提供添加和删除网络接口的基本功能,
7276
而另一些则提供更复杂的解决方案,例如与其他容器编排系统集成、运行多个 CNI 插件、高级 IPAM 功能等。
7377

78+
<!--
79+
See [this page](/docs/concepts/cluster-administration/addons/#networking-and-network-policy)
80+
for a non-exhaustive list of networking addons supported by Kubernetes.
81+
-->
7482
请参阅[此页面](/zh-cn/docs/concepts/cluster-administration/addons/#networking-and-network-policy)了解
7583
Kubernetes 支持的网络插件的非详尽列表。
7684

7785
## {{% heading "whatsnext" %}}
7886

7987
<!--
80-
The early design of the networking model and its rationale, and some future
81-
plans are described in more detail in the
88+
The early design of the networking model and its rationale are described in more detail in the
8289
[networking design document](https://git.k8s.io/design-proposals-archive/network/networking.md).
90+
For future plans and some on-going efforts that aim to improve Kubernetes networking, please
91+
refer to the SIG-Network
92+
[KEPs](https://github.com/kubernetes/enhancements/tree/master/keps/sig-network).
8393
-->
84-
网络模型的早期设计、运行原理以及未来的一些计划,
85-
都在[联网设计文档](https://git.k8s.io/design-proposals-archive/network/networking.md)里有更详细的描述。
94+
网络模型的早期设计、运行原理都在[联网设计文档](https://git.k8s.io/design-proposals-archive/network/networking.md)里有详细描述。
95+
关于未来的计划,以及旨在改进 Kubernetes 联网能力的一些正在进行的工作,可以参考 SIG Network
96+
[KEPs](https://github.com/kubernetes/enhancements/tree/master/keps/sig-network)

content/zh-cn/docs/concepts/cluster-administration/system-traces.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,19 @@ span will be sent to the exporter.
215215
<!--
216216
The kubelet in Kubernetes v{{< skew currentVersion >}} collects spans from
217217
the garbage collection, pod synchronization routine as well as every gRPC
218-
method. Connected container runtimes like CRI-O and containerd can link the
219-
traces to their exported spans to provide additional context of information.
218+
method. The kubelet propagates trace context with gRPC requests so that
219+
container runtimes with trace instrumentation, such as CRI-O and containerd,
220+
can associate their exported spans with the trace context from the kubelet.
221+
The resulting traces will have parent-child links between kubelet and
222+
container runtime spans, providing helpful context when debugging node
223+
issues.
220224
-->
221-
Kubernetes v{{< skew currentVersion >}} 中的 kubelet 从垃圾回收、Pod
222-
同步例程以及每个 gRPC 方法中收集 span。CRI-O 和 containerd
223-
这类关联的容器运行时可以将链路链接到其导出的 span,以提供更多上下文信息。
225+
Kubernetes v{{< skew currentVersion >}} 中的 kubelet 收集与垃圾回收、Pod
226+
同步例程以及每个 gRPC 方法相关的 Span。
227+
kubelet 借助 gRPC 来传播跟踪上下文,以便 CRI-O 和 containerd
228+
这类带有跟踪插桩的容器运行时可以在其导出的 Span 与 kubelet
229+
所提供的跟踪上下文之间建立关联。所得到的跟踪数据会包含 kubelet
230+
与容器运行时 Span 之间的父子链接关系,从而为调试节点问题提供有用的上下文信息。
224231

225232
<!--
226233
Please note that exporting spans always comes with a small performance overhead

0 commit comments

Comments
 (0)