Skip to content

Commit e2a9a56

Browse files
authored
Merge pull request #25843 from jialaijun/update_glossary
update the markdown file in the glossary directory for Chinese version.
2 parents 54cb8f6 + a96c5e5 commit e2a9a56

26 files changed

+75
-64
lines changed

content/zh/docs/reference/glossary/kube-scheduler.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ id: kube-scheduler
44
date: 2018-04-12
55
full_link: /docs/reference/generated/kube-scheduler/
66
short_description: >
7-
主节点上的组件,该组件监视那些新创建的未指定运行节点的 Pod,并选择节点让 Pod 在上面运行。
7+
控制平面组件,负责监视新创建的、未指定运行节点的 Pod,选择节点让 Pod 在上面运行。
88
99
aka:
1010
tags:
@@ -19,7 +19,7 @@ id: kube-scheduler
1919
date: 2018-04-12
2020
full_link: /docs/reference/generated/kube-scheduler/
2121
short_description: >
22-
Component on the master that watches newly created pods that have no node assigned, and selects a node for them to run on.
22+
Control plane component that watches for newly created pods with no assigned node, and selects a node for them to run on.
2323
2424
aka:
2525
tags:
@@ -28,10 +28,12 @@ tags:
2828
-->
2929

3030
<!--
31-
Component on the master that watches newly created pods that have no node assigned, and selects a node for them to run on.
32-
-->
31+
Control plane component that watches for newly created
32+
{{< glossary_tooltip term_id="pod" text="Pods" >}} with no assigned
33+
{{< glossary_tooltip term_id="node" text="node">}}, and selects a node for them
34+
to run on.-->
3335

34-
主节点上的组件,该组件监视那些新创建的未指定运行节点的 Pod,并选择节点让 Pod 在上面运行。
36+
控制平面组件,负责监视新创建的、未指定运行{{< glossary_tooltip term_id="node" text="节点(node)">}}的 {{< glossary_tooltip term_id="pod" text="Pods" >}},选择节点让 Pod 在上面运行。
3537

3638
<!--more-->
3739

content/zh/docs/reference/glossary/kubelet.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ tags:
2828
<!--
2929
An agent that runs on each {{< glossary_tooltip text="node" term_id="node" >}} in the cluster. It makes sure that {{< glossary_tooltip text="containers" term_id="container" >}} are running in a {{< glossary_tooltip text="Pod" term_id="pod" >}}.
3030
-->
31-
一个在集群中每个节点上运行的代理。
32-
它保证容器都运行在 Pod 中。
31+
一个在集群中每个{{< glossary_tooltip text="节点(node)" term_id="node" >}}上运行的代理。
32+
它保证{{< glossary_tooltip text="容器(containers)" term_id="container" >}}都
33+
运行在 {{< glossary_tooltip text="Pod" term_id="pod" >}} 中。
3334

3435
<!--more-->
3536

3637
<!--
37-
The kubelet takes a set of PodSpecs that are provided through various mechanisms and ensures that the containers described in those PodSpecs are running and healthy. The kubelet doesnt manage containers which were not created by Kubernetes.
38+
The kubelet takes a set of PodSpecs that are provided through various mechanisms and ensures that the containers described in those PodSpecs are running and healthy. The kubelet doesn't manage containers which were not created by Kubernetes.
3839
-->
3940
kubelet 接收一组通过各类机制提供给它的 PodSpecs,确保这些 PodSpecs
4041
中描述的容器处于运行状态且健康。

content/zh/docs/reference/glossary/kubernetes-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tags:
1717
title: Kubernetes API
1818
id: kubernetes-api
1919
date: 2018-04-12
20-
full_link: /zh/docs/concepts/overview/kubernetes-api/
20+
full_link: /docs/concepts/overview/kubernetes-api/
2121
short_description: >
2222
The application that serves Kubernetes functionality through a RESTful interface and stores the state of the cluster.
2323
@@ -40,7 +40,7 @@ Kubernetes API 是通过 RESTful 接口提供 Kubernetes 功能服务并负责
4040
Kubernetes resources and "records of intent" are all stored as API objects, and modified via RESTful calls to the API. The API allows configuration to be managed in a declarative way. Users can interact with the Kubernetes API directly, or via tools like `kubectl`. The core Kubernetes API is flexible and can also be extended to support custom resources.
4141
-->
4242

43-
Kubernetes 资源和"意向记录"都是作为 API 对象储存的,并可以通过对 API 的 RESTful 调用进行修改
43+
Kubernetes 资源和"意向记录"都是作为 API 对象储存的,并可以通过调用 RESTful 风格的 API 进行修改
4444
API 允许以声明方式管理配置。
4545
用户可以直接和 Kubernetes API 交互,也可以通过 `kubectl` 这样的工具进行交互。
4646
核心的 Kubernetes API 是很灵活的,可以扩展以支持定制资源。

content/zh/docs/reference/glossary/label.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 标签
2+
title: 标签(Label)
33
id: label
44
date: 2018-04-12
55
full_link: /zh/docs/concepts/overview/working-with-objects/labels/
@@ -15,7 +15,7 @@ tags:
1515
title: Label
1616
id: label
1717
date: 2018-04-12
18-
full_link: /zh/docs/concepts/overview/working-with-objects/labels/
18+
full_link: /docs/concepts/overview/working-with-objects/labels/
1919
short_description: >
2020
Tags objects with identifying attributes that are meaningful and relevant to users.
2121

content/zh/docs/reference/glossary/limitrange.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ related:
4141
<!--
4242
Provides constraints to limit resource consumption per {{< glossary_tooltip text="Containers" term_id="container" >}} or {{< glossary_tooltip text="Pods" term_id="pod" >}} in a namespace.
4343
-->
44-
提供约束来限制命名空间中每个 {{< glossary_tooltip text="容器" term_id="container" >}} 或 {{< glossary_tooltip text="Pod" term_id="pod" >}} 的资源消耗。
44+
提供约束来限制命名空间中每个 {{< glossary_tooltip text="容器(Containers)" term_id="container" >}} 或 {{< glossary_tooltip text="Pod" term_id="pod" >}} 的资源消耗。
4545

4646
<!--more-->
4747
<!--
4848
LimitRange limits the quantity of objects that can be created by type,
4949
as well as the amount of compute resources that may be requested/consumed by individual {{< glossary_tooltip text="Containers" term_id="container" >}} or {{< glossary_tooltip text="Pods" term_id="pod" >}} in a namespace.
5050
-->
51-
LimitRange 按照类型来限制命名空间中对象能够创建的数量,以及单个 {{< glossary_tooltip text="容器" term_id="container" >}} 或 {{< glossary_tooltip text="Pod" term_id="pod" >}} 可以请求/使用的计算资源量。
51+
LimitRange 按照类型来限制命名空间中对象能够创建的数量,以及单个 {{< glossary_tooltip text="容器(Containers)" term_id="container" >}} 或 {{< glossary_tooltip text="Pod" term_id="pod" >}} 可以请求/使用的计算资源量。

content/zh/docs/reference/glossary/logging.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 日志
2+
title: 日志(Logging)
33
id: logging
44
date: 2019-04-04
55
full_link: /zh/docs/concepts/cluster-administration/logging/
@@ -11,7 +11,7 @@ tags:
1111
- architecture
1212
- fundamental
1313
---
14-
日志是 {{< glossary_tooltip text="集群" term_id="cluster" >}} 或应用程序记录的事件列表。
14+
日志是 {{< glossary_tooltip text="集群(cluster)" term_id="cluster" >}} 或应用程序记录的事件列表。
1515

1616
<!--
1717
---

content/zh/docs/reference/glossary/managed-service.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,15 @@ tags:
3232
<!--more-->
3333

3434
<!--
35-
Some examples of Managed Services are AWS EC2, Azure SQL Database, and GCP Pub/Sub, but they can be any software offering that can be used by an application. [Service Catalog](/docs/concepts/service-catalog/) provides a way to list, provision, and bind with Managed Services offered by {{< glossary_tooltip text="Service Brokers" term_id="service-broker" >}}.
35+
Some examples of Managed Services are AWS EC2, Azure SQL Database, and
36+
GCP Pub/Sub, but they can be any software offering that can be used by an application.
37+
[Service Catalog](/docs/concepts/extend-kubernetes/service-catalog/) provides a way to
38+
list, provision, and bind with Managed Services offered by
39+
{{< glossary_tooltip text="Service Brokers" term_id="service-broker" >}}.
3640
-->
3741
托管服务的一些例子有 AWS EC2、Azure SQL 数据库和 GCP Pub/Sub 等,
3842
不过它们也可以是可以被某应用使用的任何软件交付件。
3943
[服务目录](/zh/docs/concepts/extend-kubernetes/service-catalog/)
4044
提供了一种方法用来列举、制备和绑定到
41-
{{< glossary_tooltip text="服务代理商" term_id="service-broker" >}}
45+
{{< glossary_tooltip text="服务代理商(Service Brokers)" term_id="service-broker" >}}
4246
所提供的托管服务。

content/zh/docs/reference/glossary/manifest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 清单
2+
title: 清单(Manifest)
33
id: manifest
44
date: 2019-06-28
55
short_description: >

content/zh/docs/reference/glossary/master.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ tags:
3131
<!--
3232
The term is still being used by some provisioning tools, such as {{< glossary_tooltip text="kubeadm" term_id="kubeadm" >}}, and managed services, to {{< glossary_tooltip text="label" term_id="label" >}} {{< glossary_tooltip text="nodes" term_id="node" >}} with `kubernetes.io/role` and control placement of {{< glossary_tooltip text="control plane" term_id="control-plane" >}} {{< glossary_tooltip text="pods" term_id="pod" >}}.
3333
-->
34-
该术语仍被一些配置工具使用,如 {{< glossary_tooltip text="kubeadm" term_id="kubeadm" >}} 以及托管的服务,为 {{< glossary_tooltip text="节点" term_id="node" >}} 添加 `kubernetes.io/role` 的 {{< glossary_tooltip text="标签" term_id="label" >}},以及管理控制平面 Pod 的调度。
34+
该术语仍被一些配置工具使用,如 {{< glossary_tooltip text="kubeadm" term_id="kubeadm" >}} 以及托管的服务,为 {{< glossary_tooltip text="节点(nodes)" term_id="node" >}} 添加 `kubernetes.io/role` 的 {{< glossary_tooltip text="标签(label)" term_id="label" >}},以及管理控制平面 Pod 的调度。

content/zh/docs/reference/glossary/member.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 成员
2+
title: 成员(Member)
33
id: member
44
date: 2018-04-12
55
full_link:
@@ -30,13 +30,13 @@ tags:
3030
A continuously active {{< glossary_tooltip text="contributor" term_id="contributor" >}} in the K8s community.
3131
-->
3232

33-
K8s 社区中持续活跃的贡献者
33+
K8s 社区中持续活跃的{{< glossary_tooltip text="贡献者(contributor)" term_id="contributor" >}}
3434

3535
<!--more-->
3636

3737
<!--
3838
Members can have issues and PRs assigned to them and participate in {{< glossary_tooltip text="special interest groups (SIGs)" term_id="sig" >}} through GitHub teams. Pre-submit tests are automatically run for members' PRs. A member is expected to remain an active contributor to the community.
3939
-->
4040

41-
可以将问题单(issue)和 PR 指派给成员,成员也可以通过 GitHub 小组加入 {{< glossary_tooltip text="特别兴趣小组 (SIGs)" term_id="sig" >}}。针对成员所提交的 PR,系统自动运行提交前测试。成员应该是持续活跃的社区贡献者
41+
可以将问题单(issue)和 PR 指派给成员(Member),成员(Member)也可以通过 GitHub 小组加入 {{< glossary_tooltip text="特别兴趣小组 (SIGs)" term_id="sig" >}}。针对成员(Member)所提交的 PR,系统自动运行提交前测试。成员(Member)应该是持续活跃的社区贡献者
4242

0 commit comments

Comments
 (0)