[zh] Sync glossary reference

Author: tengqm

content/zh/docs/reference/glossary/cluster-infrastructure.md

@@ -12,7 +12,6 @@ tags:
 ---
 
 <!--
----
 title: Cluster Infrastructure
 id: cluster-infrastructure
 date: 2019-05-12
@@ -23,9 +22,8 @@ short_description: >
 aka:
 tags:
 - operation
----
 -->
 <!--
 The infrastructure layer provides and maintains VMs, networking, security groups and others.
 -->
-基础设施层提供并维护虚拟机、网络、安全组及其他资源。
+基础设施层提供并维护虚拟机、网络、安全组及其他资源。

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

@@ -13,7 +13,6 @@ tags:
 ---
 
 <!--
----
 title: Container
 id: container
 date: 2018-04-12
@@ -25,20 +24,17 @@ aka:
 tags:
 - fundamental
 - workload
----
 -->
 
 <!--
  A lightweight and portable executable image that contains software and all of its dependencies.
 -->
-
- 容器是可移植、可执行的轻量级的镜像，包含其中的软件及其相关依赖。
+容器是可移植、可执行的轻量级的镜像，包含其中的软件及其相关依赖。
 
 <!--more--> 
 
 <!--
 Containers decouple applications from underlying host infrastructure to make deployment easier in different cloud or OS environments, and for easier scaling.
 -->
-
 容器使应用和底层的主机基础设施解耦，降低了应用在不同云环境或者操作系统上的部署难度，便于应用扩展。
 

content/zh/docs/reference/glossary/control-plane.md

@@ -4,15 +4,13 @@ id: control-plane
 date: 2019-05-12
 full_link:
 short_description: >
-  Control Plane（控制平面）是指容器编排层，它暴露 API 和接口来定义、部署容器和管理容器的生命周期。
+  控制平面是指容器编排层，它暴露 API 和接口来定义、部署容器和管理容器的生命周期。
 
 aka:
 tags:
 - fundamental
----																																 
-
-<!--
 ---
+<!--
 title: Control Plane
 id: control-plane
 date: 2019-05-12
@@ -23,18 +21,16 @@ short_description: >
 aka:
 tags:
 - fundamental
----																																 
 -->
 
 <!--
  The container orchestration layer that exposes the API and interfaces to define, deploy, and manage the lifecycle of containers.
 -->
-  Control Plane（控制平面）是指容器编排层，它暴露 API 和接口来定义、部署容器和管理容器的生命周期。
-																							  
+控制平面（Control Plane）是指容器编排层，它暴露 API 和接口来定义、
+部署容器和管理容器的生命周期。
+
 <!--
  This layer is composed by many different components, such as (but not restricted to):
-									
-   
 
  * {{< glossary_tooltip text="etcd" term_id="etcd" >}}
  * {{< glossary_tooltip text="API Server" term_id="kube-apiserver" >}}
@@ -47,9 +43,9 @@ tags:
 这个编排层是由多个不同的组件组成，例如以下（但不限于）几种：
 
  * {{< glossary_tooltip text="etcd" term_id="etcd" >}}
- * {{< glossary_tooltip text="API Server" term_id="kube-apiserver" >}}
- * {{< glossary_tooltip text="Scheduler" term_id="kube-scheduler" >}}
- * {{< glossary_tooltip text="Controller Manager" term_id="kube-controller-manager" >}}
- * {{< glossary_tooltip text="Cloud Controller Manager" term_id="cloud-controller-manager" >}}
+ * {{< glossary_tooltip text="API 服务器" term_id="kube-apiserver" >}}
+ * {{< glossary_tooltip text="调度器" term_id="kube-scheduler" >}}
+ * {{< glossary_tooltip text="控制器管理器" term_id="kube-controller-manager" >}}
+ * {{< glossary_tooltip text="云控制器管理器" term_id="cloud-controller-manager" >}}
 
-这些组件可以以传统的系统服务运行也可以以容器的形式运行.运行这些组件的主机过去称为 master 节点。																																																		   
+这些组件可以以传统的系统服务运行也可以以容器的形式运行.运行这些组件的主机过去称为 master 节点。 

content/zh/docs/reference/glossary/cri-o.md

@@ -12,7 +12,6 @@ tags:
 ---
 
 <!-- 
----
 title: CRI-O
 id: cri-o
 date: 2019-05-14
@@ -23,11 +22,11 @@ short_description: >
 aka:
 tags:
 - tool
---- -->
+-->
 <!-- 
 A tool that lets you use OCI container runtimes with Kubernetes CRI.
 -->
-该工具可让您通过 Kubernetes CRI 使用 OCI 容器运行环境。
+该工具可让你通过 Kubernetes CRI 使用 OCI 容器运行时。
 
 <!--more-->
 
@@ -37,13 +36,17 @@ to enable using {{< glossary_tooltip text="container" term_id="container" >}}
 runtimes that are compatible with the Open Container Initiative (OCI)
 [runtime spec](https://www.github.com/opencontainers/runtime-spec).
 -->
-CRI-O 是 {{< glossary_tooltip text="cri" term_id="cri" >}} 的实现，与开放容器倡议 Open Container Initiative（OCI）兼容的 {{< glossary_tooltip text="container" term_id="container" >}} [运行时规范](https://www.github.com/opencontainers/runtime-spec)。
+CRI-O 是 {{< glossary_tooltip text="CRI" term_id="cri" >}} 的一种实现，
+使得你可以使用与开放容器倡议（Open Container Initiative，OCI）
+[运行时规范](https://www.github.com/opencontainers/runtime-spec)
+兼容的{{< glossary_tooltip text="容器" term_id="container" >}}。
 
 <!-- 
 Deploying CRI-O allows Kubernetes to use any OCI-compliant runtime as the container
 runtime for running {{< glossary_tooltip text="Pods" term_id="pod" >}}, and to fetch
 OCI container images from remote registries.
 -->
-部署 CRI-O 允许 Kubernetes 使用任何符合 OCI 的运行时，
-作为容器运行环境去运行 {{< glossary_tooltip text="Pods" term_id="pod" >}}，
-并从远程注册表获取 OCI 容器镜像。
+部署 CRI-O 允许 Kubernetes 使用任何符合 OCI 要求的运行时作为容器运行时
+去运行 {{< glossary_tooltip text="Pods" term_id="pod" >}}，
+并从远程容器仓库获取 OCI 容器镜像。
+

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

@@ -2,7 +2,7 @@
 title: Kubeadm
 id: kubeadm
 date: 2018-04-12
-full_link: /docs/admin/kubeadm/
+full_link: /zh/docs/setup/production-environment/tools/kubeadm/
 short_description: >
   用来快速安装 Kubernetes 并搭建安全稳定的集群的工具。
 
@@ -13,7 +13,6 @@ tags:
 ---
 
 <!--
----
 title: Kubeadm
 id: kubeadm
 date: 2018-04-12
@@ -25,19 +24,19 @@ aka:
 tags:
 - tool
 - operation
----
 -->
 
 <!--
  A tool for quickly installing Kubernetes and setting up a secure cluster.
 -->
-
- 用来快速安装 Kubernetes 并搭建安全稳定的集群的工具。
+用来快速安装 Kubernetes 并搭建安全稳定的集群的工具。
 
 <!--more--> 
 
 <!--
-You can use kubeadm to install both the control plane and the worker node components.
+You can use kubeadm to install both the control plane and the {{< glossary_tooltip text="worker node" term_id="node" >}} components.
 -->
+你可以使用 kubeadm 安装控制面和
+{{< glossary_tooltip text="工作节点" term_id="node" >}}
+组件。
 
-您可以使用 kubeadm 安装控制面和工作节点组件。

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

@@ -12,7 +12,6 @@ tags:
 - core-object
 ---
 <!--
----
 title: Kubelet
 id: kubelet
 date: 2018-04-12
@@ -24,17 +23,20 @@ aka:
 tags:
 - fundamental
 - core-object
----
 -->
+
 <!--
- An agent that runs on each node in the cluster. It makes sure that containers are running in a pod.
+ 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" >}}.
 -->
-一个在集群中每个节点上运行的代理。它保证容器都运行在 Pod 中。
+一个在集群中每个节点上运行的代理。
+它保证容器都运行在 Pod 中。
 
 <!--more--> 
 
 <!--
 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.
 -->
+kubelet 接收一组通过各类机制提供给它的 PodSpecs，确保这些 PodSpecs
+中描述的容器处于运行状态且健康。
+kubelet 不会管理不是由 Kubernetes 创建的容器。
 
-kubelet 接收一组通过各类机制提供给它的 PodSpecs，确保这些 PodSpecs 中描述的容器处于运行状态且健康。kubelet 不会管理不是由 Kubernetes 创建的容器。

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

@@ -1,5 +1,5 @@
 ---
-title: 节点
+title: 节点（Node）
 id: node
 date: 2018-04-12
 full_link: /zh/docs/concepts/architecture/nodes/
@@ -25,19 +25,26 @@ tags:
 -->
 
 <!--
-  A node is a worker machine in Kubernetes.
+A node is a worker machine in Kubernetes.
 -->
-
 Kubernetes 中的工作机器称作节点。
 
 <!--more--> 
 
 <!--
-A worker machine may be a VM or physical machine, depending on the cluster. It has the {{< glossary_tooltip text="Services" term_id="service" >}} necessary to run {{< glossary_tooltip text="Pods" term_id="pod" >}} and is managed by the master components. The {{< glossary_tooltip text="Services" term_id="service" >}} on a node include Docker, kubelet and kube-proxy.
--->
+A worker node may be a VM or physical machine, depending on the cluster. It has local daemons or services necessary to run {{< glossary_tooltip text="Pods" term_id="pod" >}} and is managed by the control plane. The daemons on a node include {{< glossary_tooltip text="kubelet" term_id="kubelet" >}}, {{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}}, and a container runtime implementing the {{< glossary_tooltip text="CRI" term_id="cri" >}} such as {{< glossary_tooltip term_id="docker" >}}.
 
+In early Kubernetes versions, Nodes were called "Minions".
+-->
 工作机器可以是虚拟机也可以是物理机，取决于集群的配置。
-其上部署了运行 {{< glossary_tooltip text="Pods" term_id="pod" >}} 所必需的{{< glossary_tooltip text="服务" term_id="service" >}}，
+其上部署了运行 {{< glossary_tooltip text="Pods" term_id="pod" >}}
+所必需的本地守护进程或{{< glossary_tooltip text="服务" term_id="service" >}}，
 并由主控组件来管理。
-节点上的{{< glossary_tooltip text="服务" term_id="service" >}}包括 Docker、kubelet 和 kube-proxy。
+节点上的的守护进程包括 {{< glossary_tooltip text="kubelet" term_id="kubelet" >}}、
+{{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}}
+以及一个 {{< glossary_tooltip term_id="docker" >}} 这种
+实现了 {{< glossary_tooltip text="CRI" term_id="cri" >}}
+的容器运行时。
+
+在早期的 Kubernetes 版本中，节点也称作 "Minions"。
 

content/zh/docs/reference/glossary/platform-developer.md

@@ -1,5 +1,5 @@
 ---
-title: 平台开发者
+title: 平台开发人员（Platform Developer）
 id: platform-developer
 date: 2018-04-12
 full_link: 
@@ -12,7 +12,6 @@ tags:
 ---
 
 <!--
----
 title: Platform Developer
 id: platform-developer
 date: 2018-04-12
@@ -23,20 +22,29 @@ short_description: >
 aka: 
 tags:
 - user-type
----
 -->
 
 <!--
- A person who customizes the Kubernetes platform to fit the needs of their project.
+A person who customizes the Kubernetes platform to fit the needs of their project.
 -->
 
- 定制 Kubernetes 平台以满足自己的项目需求的人。
+定制 Kubernetes 平台以满足自己的项目需求的人。
 
 <!--more--> 
 
 <!--
-A platform developer may, for example, use [Custom Resources](/docs/concepts/api-extension/custom-resources/) or [Extend the Kubernetes API with the aggregation layer](/docs/concepts/api-extension/apiserver-aggregation/) to add functionality to their instance of Kubernetes, specifically for their application.  Some Platform Developers are also {{< glossary_tooltip text="contributors" term_id="contributor" >}} and develop extensions which are contributed to the Kubernetes community.  Others develop closed-source commercial or site-specific extensions.
+A platform developer may, for example, use [Custom Resources](/docs/concepts/extend-kubernetes/api-extension/custom-resources/) or
+[Extend the Kubernetes API with the aggregation layer](/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/)
+to add functionality to their instance of Kubernetes, specifically for their application.
+Some Platform Developers are also {{< glossary_tooltip text="contributors" term_id="contributor" >}} and
+develop extensions which are contributed to the Kubernetes community.
+Others develop closed-source commercial or site-specific extensions.
 -->
 
-例如，平台开发人员可以使用[定制资源](/docs/concepts/api-extension/custom-resources/)或[使用汇聚层扩展 Kubernetes API](/docs/concepts/api-extension/apiserver-aggregation/) 来为其 Kubernetes 实例增加功能，特别是为其应用程序添加功能。一些平台开发人员也是 Kubrenetes {{< glossary_tooltip text="贡献者" term_id="contributor" >}}，他们会开发贡献给 Kubernetes 社区的扩展；另一些则开发封闭源代码的商业扩展或用于特定功能的扩展。
+平台开发人员可以使用[定制资源](/zh/docs/concepts/extend-kubernetes/api-extension/custom-resources/)
+或[使用汇聚层扩展 Kubernetes API](/zh/docs/concepts/api-extension/apiserver-aggregation/)
+来为其 Kubernetes 实例增加功能，特别是为其应用程序添加功能。
+一些平台开发人员也是 Kubrenetes {{< glossary_tooltip text="贡献者" term_id="contributor" >}}，
+他们会开发贡献给 Kubernetes 社区的扩展。
+另一些平台开发人员则开发封闭源代码的商业扩展或用于特定网站的扩展。
 

content/zh/docs/reference/glossary/pod-priority.md

@@ -1,8 +1,8 @@
 ---
-title: Pod 优先级
+title: Pod 优先级（Pod Priority）
 id: pod-priority
 date: 2019-01-31
-full_link: /docs/concepts/configuration/pod-priority-preemption/#pod-priority
+full_link: /zh/docs/concepts/configuration/pod-priority-preemption/#pod-priority
 short_description: >
   Pod 优先级表示一个 Pod 相对于其他 Pod 的重要性。
 
@@ -12,7 +12,6 @@ tags:
 ---
 
 <!--
----
 title: Pod Priority
 id: pod-priority
 date: 2019-01-31
@@ -23,7 +22,6 @@ short_description: >
 aka:
 tags:
 - operation
----
 -->
 
 <!--
@@ -36,4 +34,7 @@ tags:
 <!--
 [Pod Priority](/docs/concepts/configuration/pod-priority-preemption/#pod-priority) gives the ability to set scheduling priority of a Pod to be higher and lower than other Pods — an important feature for production clusters workload.
 -->
-[Pod 优先级](/docs/concepts/configuration/pod-priority-preemption/#pod-priority) 允许为一个 Pod 设置高于或低于其他 Pod 的优先级 -- 这对于生产集群工作负载而言是一个重要的特性。
+[Pod 优先级](/zh/docs/concepts/configuration/pod-priority-preemption/#pod-priority)
+允许用户为 Pod 设置高于或低于其他 Pod 的优先级 -- 这对于生产集群
+工作负载而言是一个重要的特性。
+