Skip to content

Commit 3c73460

Browse files
authored
Merge pull request #36597 from ydFu/new-update-reference-glossary-11
[zh] Update reference\glossary (11)
2 parents 09f254c + 560a0a3 commit 3c73460

File tree

4 files changed

+28
-26
lines changed

4 files changed

+28
-26
lines changed

content/zh-cn/docs/reference/glossary/device-plugin.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ tags:
1010
- fundamental
1111
- extension
1212
---
13-
1413
<!--
15-
---
1614
title: Device Plugin
1715
id: device-plugin
1816
date: 2019-02-02
@@ -23,16 +21,19 @@ aka:
2321
tags:
2422
- fundamental
2523
- extension
26-
---
2724
-->
25+
2826
<!--
2927
Device plugins run on worker
3028
{{< glossary_tooltip term_id="node" text="Nodes">}} and provide
3129
{{< glossary_tooltip term_id="pod" text="Pods ">}} with access to resources,
3230
such as local hardware, that require vendor-specific initialization or setup
3331
steps.
3432
-->
35-
设备插件工作在节点主机上,给 {{< glossary_tooltip term_id="pod" text="Pods ">}} 提供访问资源的权限,比如特定厂商初始化或者安装的本地硬件。
33+
设备插件在工作{{<glossary_tooltip term_id="node" text="节点">}}上运行并为
34+
{{<glossary_tooltip term_id="pod" text="Pod">}} 提供访问资源的能力,
35+
例如:本地硬件这类资源需要特定于供应商的初始化或安装步骤。
36+
3637
<!--more-->
3738

3839
<!--
@@ -42,11 +43,15 @@ Pods can access hardware features that relate to the Node where that Pod is runn
4243
You can deploy a device plugin as a {{< glossary_tooltip term_id="daemonset" >}},
4344
or install the device plugin software directly on each target Node.
4445
-->
45-
设备插件将资源告知 {{< glossary_tooltip term_id="kubelet" text="kubelet" >}} ,以便相关节点上运行的工作负载Pod可以访问硬件功能。
46+
设备插件向 {{<glossary_tooltip term_id="kubelet" text="kubelet" >}} 公布资源,以便工作负载
47+
Pod 访问 Pod 运行所在节点上的硬件功能特性。
48+
你可以将设备插件部署为 {{<glossary_tooltip term_id="daemonset" >}},
49+
或者直接在每个目标节点上安装设备插件软件。
50+
4651
<!--
4752
See
4853
4954
[Device Plugins](/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/)
5055
for more information.
5156
-->
52-
更多信息请查阅[设备插件](/zh-cn/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/)
57+
更多信息请查阅[设备插件](/zh-cn/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/)

content/zh-cn/docs/reference/glossary/disruption.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ aka:
99
tags:
1010
- fundamental
1111
---
12-
干扰是指导致一个或者多个 {{< glossary_tooltip term_id="pod" text="Pod" >}} 服务停止的事件。
13-
干扰会影响工作负载资源,比如 {{< glossary_tooltip term_id="deployment" >}} 这种依赖于受影响 Pod 的资源。
14-
1512
<!--
16-
---
1713
title: Disruption
1814
id: disruption
1915
date: 2019-09-10
@@ -23,13 +19,17 @@ short_description: >
2319
aka:
2420
tags:
2521
- fundamental
26-
---
22+
-->
23+
24+
<!--
2725
Disruptions are events that lead to one or more
2826
{{< glossary_tooltip term_id="pod" text="Pods" >}} going out of service.
2927
A disruption has consequences for workload resources, such as
3028
{{< glossary_tooltip term_id="deployment" >}}, that rely on the affected
3129
Pods.
32-
-->
30+
-->
31+
干扰(Disruption)是指导致一个或者多个 {{< glossary_tooltip term_id="pod" text="Pod" >}} 服务停止的事件。
32+
干扰会影响依赖于受影响的 Pod 的资源,例如 {{< glossary_tooltip term_id="deployment" >}}。
3333

3434
<!--more-->
3535

@@ -41,7 +41,9 @@ Kubernetes terms that an _involuntary disruption_.
4141
4242
See [Disruptions](/docs/concepts/workloads/pods/disruptions/) for more information.
4343
-->
44-
如果你作为一个集群操作人员,销毁了一个从属于某个应用的 Pod, Kubernetes 视之为**自愿干扰(Voluntary Disruption)**
45-
如果由于节点故障 或者影响更大区域故障的断电导致 Pod 离线,kubernetes 视之为**非愿干扰(Involuntary Disruption)**
44+
如果你作为一个集群操作人员,销毁了一个从属于某个应用的 Pod,
45+
Kubernetes 视之为**自愿干扰(Voluntary Disruption)**
46+
如果由于节点故障或者影响更大区域故障的断电导致 Pod 离线,
47+
Kubernetes 视之为**非愿干扰(Involuntary Disruption)**
4648

47-
更多信息请查阅[Disruptions](/zh-cn/docs/concepts/workloads/pods/disruptions/)
49+
更多信息请查阅[干扰](/zh-cn/docs/concepts/workloads/pods/disruptions/)

content/zh-cn/docs/reference/glossary/docker.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
title: Docker
33
id: docker
44
date: 2018-04-12
5-
full_link: /zh-cn/docs/reference/kubectl/docker-cli-to-kubectl/
5+
full_link: https://docs.docker.com/engine/
66
short_description: >
77
Docker 是一种可以提供操作系统级别虚拟化(也称作容器)的软件技术。
88
99
aka:
1010
tags:
1111
- fundamental
1212
---
13-
1413
<!--
15-
---
1614
title: Docker
1715
id: docker
1816
date: 2018-04-12
@@ -23,20 +21,18 @@ short_description: >
2321
aka:
2422
tags:
2523
- fundamental
26-
---
2724
-->
2825

2926
<!--
3027
Docker (specifically, Docker Engine) is a software technology providing operating-system-level virtualization also known as {{< glossary_tooltip text="containers" term_id="container" >}}.
3128
-->
32-
33-
Docker(这里特指 Docker 引擎) 是一种可以提供操作系统级别虚拟化(也称作{{< glossary_tooltip text="容器" term_id="container" >}})的软件技术。
29+
Docker(这里特指 Docker Engine)是一种可以提供操作系统级别虚拟化
30+
(也称作{{< glossary_tooltip text="容器" term_id="container" >}})的软件技术。
3431

3532
<!--more-->
3633

3734
<!--
3835
Docker uses the resource isolation features of the Linux kernel such as cgroups and kernel namespaces, and a union-capable file system such as OverlayFS and others to allow independent "containers" to run within a single Linux instance, avoiding the overhead of starting and maintaining virtual machines (VMs).
3936
-->
40-
4137
Docker 使用了 Linux 内核中的资源隔离特性(如 cgroup 和内核命名空间)以及支持联合文件系统(如 OverlayFS 和其他),
42-
允许多个相互独立的“容器”一起运行在同一 Linux 实例上,从而避免启动和维护虚拟机(VMs)的开销。
38+
允许多个相互独立的“容器”一起运行在同一 Linux 实例上,从而避免启动和维护虚拟机(Virtual Machines;VM)的开销。

content/zh-cn/docs/reference/glossary/dockershim.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ aka:
1010
tags:
1111
- fundamental
1212
---
13-
1413
<!--
1514
title: Dockershim
1615
id: dockershim
@@ -28,11 +27,11 @@ tags:
2827
The dockershim is a component of Kubernetes version 1.23 and earlier. It allows the kubelet
2928
to communicate with {{< glossary_tooltip text="Docker Engine" term_id="docker" >}}.
3029
-->
31-
3230
dockershim 是 Kubernetes v1.23 及之前版本中的一个组件。
33-
Kubernetes 系统组件通过它与 {{< glossary_tooltip text="Docker Engine" term_id="docker" >}} 通信。
31+
Kubernetes 系统组件通过它与 {{< glossary_tooltip text="Docker Engine" term_id="docker" >}}通信。
3432

3533
<!--more-->
34+
3635
<!--
3736
Starting with version 1.24, dockershim has been removed from Kubernetes. For more information, see [Dockershim FAQ](/dockershim).
3837
-->

0 commit comments

Comments
 (0)