From cea8814946c6b19f7bd7c44ca32592b6cd42f5b6 Mon Sep 17 00:00:00 2001
From: Dominic Yin <yindongchao@inspur.com>
Date: Sun, 5 Apr 2020 00:57:51 +0800
Subject: [PATCH 1/2] update content/zh/docs/concepts/overview/components.md

---
 .../zh/docs/concepts/overview/components.md   | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/content/zh/docs/concepts/overview/components.md b/content/zh/docs/concepts/overview/components.md
index 495982a463..db4c7432fd 100644
--- a/content/zh/docs/concepts/overview/components.md
+++ b/content/zh/docs/concepts/overview/components.md
@@ -21,31 +21,45 @@ card:
 
 {{% capture overview %}}
 <!--
-This document outlines the various binary components needed to
-deliver a functioning Kubernetes cluster.
+When you deploy Kubernetes, you get a cluster.
+{{< glossary_definition term_id="cluster" length="all" prepend="A Kubernetes cluster consists of">}}
+
+This document outlines the various components you need to have
+a complete and working Kubernetes cluster.
+
+Here's the diagram of a Kubernetes cluster with all the components tied together.
+
+![Components of Kubernetes](/images/docs/components-of-kubernetes.png)
 -->
-本文档概述了交付正常运行的 Kubernetes 集群所需的各种二进制组件。
+当你部署完 Kubernetes, 即拥有了一个完整的集群。
+{{< glossary_definition term_id="cluster" length="all" prepend="一个 Kubernetes 集群包含">}}
+
+本文档概述了交付正常运行的 Kubernetes 集群所需的各种组件。
+
+这张图表展示了包含所有相互关联组件的完整 Kubernetes 集群。
+
+![Components of Kubernetes](/images/docs/components-of-kubernetes.png)
+
 {{% /capture %}}
 
 {{% capture body %}}
-<!--
-## Master Components
+<!-- 
+## Control Plane Components
 -->
-## Master 组件
+## 控制平面组件（Control Plane Components）
 
-<!--
-Master components provide the cluster's control plane. Master components make global decisions about the
-cluster (for example, scheduling), and they detect and respond to cluster events (for example, starting up a new {{< glossary_tooltip text="pod" term_id="pod">}} when a deployment's `replicas` field is unsatisfied).
--->
-Master 组件提供集群的控制平面。Master 组件对集群进行全局决策（例如，调度），并检测和响应集群事件（例如，当不满足部署的 `replicas` 字段时，启动新的 {{< glossary_tooltip text="pod" term_id="pod">}}）。
+<!-- 
+The Control Plane's components make global decisions about the cluster (for example, scheduling), as well as detecting and responding to cluster events (for example, starting up a new {{< glossary_tooltip text="pod" term_id="pod">}} when a deployment's `replicas` field is unsatisfied).
+ -->
+控制平面的组件对集群做出全局决策(比如调度)，以及检测和响应集群事件（例如，当不满足部署的 `replicas` 字段时，启动新的 {{< glossary_tooltip text="pod" term_id="pod">}}）。
 
-<!--
-Master components can be run on any machine in the cluster. However,
-for simplicity, set up scripts typically start all master components on
+<!-- 
+Control Plane components can be run on any machine in the cluster. However,
+for simplicity, set up scripts typically start all Control Plane components on
 the same machine, and do not run user containers on this machine. See
 [Building High-Availability Clusters](/docs/admin/high-availability/) for an example multi-master-VM setup.
--->
-Master 组件可以在集群中的任何节点上运行。然而，为了简单起见，安装脚本通常会启动同一个计算机上所有 Master 组件，并且不会在计算机上运行用户容器。请参阅[构建高可用性集群](/docs/admin/high-availability/)示例对于多主机 VM 的安装。
+ -->
+控制平面组件可以在集群中的任何节点上运行。然而，为了简单起见，安装脚本通常会启动同一个计算机上所有控制平面组件，并且不会在计算机上运行用户容器。请参阅[构建高可用性集群](/docs/admin/high-availability/)示例对于多主机 VM 的安装。
 
 ### kube-apiserver
 

From bb3a9f7b49e1d35d0c262ab2107a4164cfca4f66 Mon Sep 17 00:00:00 2001
From: Dominic Yin <yindongchao@inspur.com>
Date: Sun, 5 Apr 2020 01:18:32 +0800
Subject: [PATCH 2/2] update content/zh/concepts/overview/components.md fix
 rendering error of capture overview

---
 content/zh/docs/concepts/overview/components.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/zh/docs/concepts/overview/components.md b/content/zh/docs/concepts/overview/components.md
index db4c7432fd..dedb3d78f0 100644
--- a/content/zh/docs/concepts/overview/components.md
+++ b/content/zh/docs/concepts/overview/components.md
@@ -19,7 +19,6 @@ card:
 ---
 -->
 
-{{% capture overview %}}
 <!--
 When you deploy Kubernetes, you get a cluster.
 {{< glossary_definition term_id="cluster" length="all" prepend="A Kubernetes cluster consists of">}}
@@ -31,12 +30,13 @@ Here's the diagram of a Kubernetes cluster with all the components tied together
 
 ![Components of Kubernetes](/images/docs/components-of-kubernetes.png)
 -->
+{{% capture overview %}}
 当你部署完 Kubernetes, 即拥有了一个完整的集群。
 {{< glossary_definition term_id="cluster" length="all" prepend="一个 Kubernetes 集群包含">}}
 
 本文档概述了交付正常运行的 Kubernetes 集群所需的各种组件。
 
-这张图表展示了包含所有相互关联组件的完整 Kubernetes 集群。
+这张图表展示了包含所有相互关联组件的 Kubernetes 集群。
 
 ![Components of Kubernetes](/images/docs/components-of-kubernetes.png)