From 0997416af616b5b74079855f45c8a2129a73a554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E7=8E=89=E5=A0=82?= <irichardwang@gmail.com>
Date: Mon, 5 Oct 2020 17:18:49 +0800
Subject: [PATCH 1/6] Update encrypt-data.md

---
 content/zh/docs/tasks/administer-cluster/encrypt-data.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/content/zh/docs/tasks/administer-cluster/encrypt-data.md b/content/zh/docs/tasks/administer-cluster/encrypt-data.md
index 65e7689406..6a645eb2ec 100644
--- a/content/zh/docs/tasks/administer-cluster/encrypt-data.md
+++ b/content/zh/docs/tasks/administer-cluster/encrypt-data.md
@@ -206,7 +206,7 @@ To create a new secret perform the following steps:
 {{< caution >}}
 你的配置文件包含可以解密 etcd 内容的密钥，因此你必须正确限制主控节点的访问权限，
 以便只有能运行 kube-apiserver 的用户才能读取它。
-{{< caution >}}
+{{< /caution >}}
 
 <!--
 ## Verifying that data is encrypted
@@ -232,9 +232,8 @@ program to retrieve the contents of your secret.
 2. Using the etcdctl commandline, read that secret out of etcd:
 -->
 2. 使用 etcdctl 命令行，从 etcd 中读取 secret：
-
    ```shell
-   ETCDCTL_API=3 etcdctl get /registry/secrets/default/secret1 [...] | hexdump -C
+   ETCDCTL_API=3 etcdctl get /registry/secrets/default/secret1 [...] | hexdump -C
    ```
 
    <!--

From 775c0b107290f5509cc137b02f84ff7a10b448a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E7=8E=89=E5=A0=82?= <irichardwang@gmail.com>
Date: Mon, 5 Oct 2020 17:29:54 +0800
Subject: [PATCH 2/6] Update kubectl.md

---
 content/zh/docs/reference/kubectl/kubectl.md | 55 +++-----------------
 1 file changed, 6 insertions(+), 49 deletions(-)

diff --git a/content/zh/docs/reference/kubectl/kubectl.md b/content/zh/docs/reference/kubectl/kubectl.md
index a40844d663..0315186257 100644
--- a/content/zh/docs/reference/kubectl/kubectl.md
+++ b/content/zh/docs/reference/kubectl/kubectl.md
@@ -30,18 +30,14 @@ Find more information at: https://kubernetes.io/docs/reference/kubectl/overview/
 kubectl [flags]
 ```
 
-
-
 ## {{% heading "options" %}}
 
-
-<table style="width: 100%; table-layout: fixed;">
-  <colgroup>
-    <col span="1" style="width: 10px;" />
-    <col span="1" />
-  </colgroup>
-  <tbody>
-
+   <table style="width: 100%; table-layout: fixed;">
+<colgroup>
+<col span="1" style="width: 10px;" />
+<col span="1" />
+</colgroup>
+<tbody>
     <tr>
       <td colspan="2">--add-dir-header</td>
     </tr>
@@ -53,7 +49,6 @@ kubectl [flags]
       设置为 true 表示添加文件目录到 header 中
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--alsologtostderr</td>
     </tr>
@@ -65,7 +60,6 @@ kubectl [flags]
       表示将日志输出到文件的同时输出到 stderr
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--as string</td>
     </tr>
@@ -77,7 +71,6 @@ kubectl [flags]
       以指定用户的身份执行操作
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--as-group stringArray</td>
     </tr>
@@ -89,7 +82,6 @@ kubectl [flags]
       模拟指定的组来执行操作，可以使用这个标志来指定多个组。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--azure-container-registry-config string</td>
     </tr>
@@ -101,7 +93,6 @@ kubectl [flags]
       包含 Azure 容器仓库配置信息的文件的路径。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--cache-dir string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: "~/.kube/http-cache"</td>
     </tr>
@@ -113,7 +104,6 @@ kubectl [flags]
       默认 HTTP 缓存目录
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--certificate-authority string</td>
     </tr>
@@ -125,7 +115,6 @@ kubectl [flags]
       指向证书机构的 cert 文件路径
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--client-certificate string</td>
     </tr>
@@ -137,7 +126,6 @@ kubectl [flags]
       TLS 使用的客户端证书路径
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--client-key string</td>
     </tr>
@@ -149,7 +137,6 @@ kubectl [flags]
       TLS 使用的客户端密钥文件路径
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--cloud-provider-gce-lb-src-cidrs cidrs&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: 130.211.0.0/22,209.85.152.0/22,209.85.204.0/22,35.191.0.0/16</td>
     </tr>
@@ -161,7 +148,6 @@ kubectl [flags]
       在 GCE 防火墙中打开 CIDR，以进行 LB 流量代理和运行状况检查。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--cluster string</td>
     </tr>
@@ -173,7 +159,6 @@ kubectl [flags]
       要使用的 kubeconfig 集群的名称
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--context string</td>
     </tr>
@@ -185,7 +170,6 @@ kubectl [flags]
       要使用的 kubeconfig 上下文的名称
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--default-not-ready-toleration-seconds int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: 300</td>
     </tr>
@@ -197,7 +181,6 @@ kubectl [flags]
       表示 `notReady` 状态的容忍度秒数：默认情况下，`NoExecute` 被添加到尚未具有此容忍度的每个 Pod 中。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--default-unreachable-toleration-seconds int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: 300</td>
     </tr>
@@ -209,7 +192,6 @@ kubectl [flags]
       表示 `unreachable` 状态的容忍度秒数：默认情况下，`NoExecute` 被添加到尚未具有此容忍度的每个 Pod 中。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">-h, --help</td>
     </tr>
@@ -221,7 +203,6 @@ kubectl [flags]
       kubectl 操作的帮助命令
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--insecure-skip-tls-verify</td>
     </tr>
@@ -233,7 +214,6 @@ kubectl [flags]
       设置为 true，则表示不会检查服务器证书的有效性。这样会导致您的 HTTPS 连接不安全。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--kubeconfig string</td>
     </tr>
@@ -245,7 +225,6 @@ kubectl [flags]
       CLI 请求使用的 kubeconfig 配置文件的路径。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--log-backtrace-at traceLocation&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: 0</td>
     </tr>
@@ -257,7 +236,6 @@ kubectl [flags]
       当日志机制运行到指定文件的指定行（file:N）时，打印调用堆栈信息
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--log-dir string</td>
     </tr>
@@ -269,7 +247,6 @@ kubectl [flags]
       如果不为空，则将日志文件写入此目录
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--log-file string</td>
     </tr>
@@ -281,7 +258,6 @@ kubectl [flags]
       如果不为空，则将使用此日志文件
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--log-file-max-size uint&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: 1800</td>
     </tr>
@@ -293,7 +269,6 @@ kubectl [flags]
       定义日志文件的最大尺寸。单位为兆字节。如果值设置为 0，则表示日志文件大小不受限制。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--log-flush-frequency duration&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: 5s</td>
     </tr>
@@ -305,7 +280,6 @@ kubectl [flags]
       两次日志刷新操作之间的最长时间（秒）
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--logtostderr&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: true</td>
     </tr>
@@ -317,7 +291,6 @@ kubectl [flags]
       日志输出到 stderr 而不是文件中
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--match-server-version</td>
     </tr>
@@ -329,7 +302,6 @@ kubectl [flags]
       要求客户端版本和服务端版本相匹配
       </td>
     </tr>
-
     <tr>
       <td colspan="2">-n, --namespace string</td>
     </tr>
@@ -341,7 +313,6 @@ kubectl [flags]
       如果存在，CLI 请求将使用此命名空间
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--password string</td>
     </tr>
@@ -353,7 +324,6 @@ kubectl [flags]
       API 服务器进行基本身份验证的密码
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--profile string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: "none"</td>
     </tr>
@@ -365,7 +335,6 @@ kubectl [flags]
       要记录的性能指标的名称。可取 (none|cpu|heap|goroutine|threadcreate|block|mutex) 其中之一。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--profile-output string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: "profile.pprof"</td>
     </tr>
@@ -377,7 +346,6 @@ kubectl [flags]
       用于转储所记录的性能信息的文件名
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--request-timeout string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: "0"</td>
     </tr>
@@ -389,7 +357,6 @@ kubectl [flags]
       放弃单个服务器请求之前的等待时间，非零值需要包含相应时间单位（例如：1s、2m、3h）。零值则表示不做超时要求。
       </td>
     </tr>
-
     <tr>
       <td colspan="2">-s, --server string</td>
     </tr>
@@ -401,7 +368,6 @@ kubectl [flags]
       Kubernetes API 服务器的地址和端口
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--skip-headers</td>
     </tr>
@@ -413,7 +379,6 @@ kubectl [flags]
       设置为 true 则表示跳过在日志消息中出现 header 前缀信息
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--skip-log-headers</td>
     </tr>
@@ -425,7 +390,6 @@ kubectl [flags]
       设置为 true 则表示在打开日志文件时跳过 header 信息
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--stderrthreshold severity&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: 2</td>
     </tr>
@@ -437,7 +401,6 @@ kubectl [flags]
       等于或高于此阈值的日志将输出到标准错误输出（stderr）
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--token string</td>
     </tr>
@@ -449,7 +412,6 @@ kubectl [flags]
       用于对 API 服务器进行身份认证的持有者令牌
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--user string</td>
     </tr>
@@ -461,7 +423,6 @@ kubectl [flags]
       指定使用 kubeconfig 配置文件中的用户名
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--username string</td>
     </tr>
@@ -473,7 +434,6 @@ kubectl [flags]
       用于 API 服务器的基本身份验证的用户名
       </td>
     </tr>
-
     <tr>
       <td colspan="2">-v, --v Level</td>
     </tr>
@@ -485,7 +445,6 @@ kubectl [flags]
       指定输出日志的日志详细级别
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--version version[=true]</td>
     </tr>
@@ -497,7 +456,6 @@ kubectl [flags]
       打印 kubectl 版本信息并退出
       </td>
     </tr>
-
     <tr>
       <td colspan="2">--vmodule moduleSpec</td>
     </tr>
@@ -509,7 +467,6 @@ kubectl [flags]
       以逗号分隔的 pattern=N 设置列表，用于过滤文件的日志记录
       </td>
     </tr>
-
   </tbody>
 </table>
 

From a758f483dc2a5ad211cebcc09ff822fae10ea4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E7=8E=89=E5=A0=82?= <irichardwang@gmail.com>
Date: Mon, 5 Oct 2020 17:40:47 +0800
Subject: [PATCH 3/6] Update 2019-06-19-kubernetes-1-15-release-announcement.md

---
 .../_posts/2019-06-19-kubernetes-1-15-release-announcement.md   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/en/blog/_posts/2019-06-19-kubernetes-1-15-release-announcement.md b/content/en/blog/_posts/2019-06-19-kubernetes-1-15-release-announcement.md
index 49519cef15..3561203548 100644
--- a/content/en/blog/_posts/2019-06-19-kubernetes-1-15-release-announcement.md
+++ b/content/en/blog/_posts/2019-06-19-kubernetes-1-15-release-announcement.md
@@ -89,7 +89,7 @@ Volume cloning enables users to specify another PVC as a "DataSource" when provi
 - ExecutionHook API [designed to trigger hook commands](https://github.com/kubernetes/enhancements/issues/962) in the containers for different use cases is now Alpha.
 - Continued deprecation of extensions/v1beta1, apps/v1beta1, and apps/v1beta2 APIs; these extensions will be retired in 1.16!
 
-Check the [release notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.15.md#kubernetes-v115-release-notes) for a complete list of notable features and fixes.
+Check the [release notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.15.md#kubernetes-v115-release-notes) for a complete list of notable features and fixes.
 
 **Availability**
 

From f8ae27002822c85072575f5ba780f8654f5761d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E7=8E=89=E5=A0=82?= <irichardwang@gmail.com>
Date: Mon, 5 Oct 2020 17:48:10 +0800
Subject: [PATCH 4/6] Update labels.md

---
 .../zh/docs/concepts/overview/working-with-objects/labels.md    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/zh/docs/concepts/overview/working-with-objects/labels.md b/content/zh/docs/concepts/overview/working-with-objects/labels.md
index 941cdaccb2..8e30177cee 100644
--- a/content/zh/docs/concepts/overview/working-with-objects/labels.md
+++ b/content/zh/docs/concepts/overview/working-with-objects/labels.md
@@ -239,7 +239,7 @@ Similarly the comma separator acts as an _AND_ operator. So filtering resources
 The _set-based_ label selector is a general form of equality since `environment=production` is equivalent to `environment in (production)`; similarly for `!=` and `notin`.
 -->
 _基于集合_ 的标签选择算符是相等标签选择算符的一般形式，因为 `environment=production`
-等同于 `environment in（production`；`!=` 和 `notin` 也是类似的。
+等同于 `environment in（production）`；`!=` 和 `notin` 也是类似的。
 
 <!--
 _Set-based_ requirements can be mixed with _equality-based_ requirements. For example: `partition in (customerA, customerB),environment!=qa`.

From 37cdad030e913bc013d6f44f0284d6d4cd017573 Mon Sep 17 00:00:00 2001
From: "M. Habib Rosyad" <habib.ryd@gmail.com>
Date: Mon, 5 Oct 2020 17:12:12 +0700
Subject: [PATCH 5/6] glossary: translate applications and cgroup into Bahasa

---
 .../id/docs/reference/glossary/applications.md  | 12 ++++++++++++
 content/id/docs/reference/glossary/cgroup.md    | 17 +++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 content/id/docs/reference/glossary/applications.md
 create mode 100644 content/id/docs/reference/glossary/cgroup.md

diff --git a/content/id/docs/reference/glossary/applications.md b/content/id/docs/reference/glossary/applications.md
new file mode 100644
index 0000000000..643b3c9b27
--- /dev/null
+++ b/content/id/docs/reference/glossary/applications.md
@@ -0,0 +1,12 @@
+---
+title: Aplikasi
+id: applications
+date: 2019-05-12
+full_link:
+short_description: >
+  Lapisan (_layer_) tempat menjalankan berbagai aplikasi dalam Container.
+aka:
+tags:
+- fundamental
+---
+Lapisan (_layer_) tempat menjalankan berbagai aplikasi dalam Container.
diff --git a/content/id/docs/reference/glossary/cgroup.md b/content/id/docs/reference/glossary/cgroup.md
new file mode 100644
index 0000000000..ef418f00b3
--- /dev/null
+++ b/content/id/docs/reference/glossary/cgroup.md
@@ -0,0 +1,17 @@
+---
+title: cgroup (control group)
+id: cgroup
+date: 2019-06-25
+full_link:
+short_description: >
+  Suatu grup proses Linux dengan isolasi, penghitungan, dan pembatasan sumber daya opsional.
+aka:
+- grup kontrol
+tags:
+- fundamental
+---
+Suatu grup proses Linux dengan isolasi, penghitungan, dan pembatasan sumber daya opsional.
+
+<!--more--> 
+
+cgroup merupakan fitur kernel Linux yang membatasi, menghitung, dan mengisolasi penggunaan sumber daya (CPU, memori, I/O diska, jaringan) untuk sekumpulan proses.

From 263125f4408ddeeec778d5e1dfcbd772007aa521 Mon Sep 17 00:00:00 2001
From: "M. Habib Rosyad" <habib.ryd@gmail.com>
Date: Mon, 5 Oct 2020 17:16:26 +0700
Subject: [PATCH 6/6] glossary: translate cluster and cluster-operator into
 Bahasa

---
 .../docs/reference/glossary/cluster-operator.md | 16 +++++++---------
 content/id/docs/reference/glossary/cluster.md   | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 content/id/docs/reference/glossary/cluster.md

diff --git a/content/id/docs/reference/glossary/cluster-operator.md b/content/id/docs/reference/glossary/cluster-operator.md
index e1d09dbc7d..893aaeae5e 100644
--- a/content/id/docs/reference/glossary/cluster-operator.md
+++ b/content/id/docs/reference/glossary/cluster-operator.md
@@ -1,23 +1,21 @@
 ---
-title: Cluster Operator
+title: Operator Klaster
 id: cluster-operator
 date: 2018-04-12
 full_link: 
 short_description: >
-  Seseorang yang mengkonfigurasi, mengontrol, dan memonitor cluster.
+  Seseorang yang mengonfigurasi, mengontrol, dan memonitor klaster.
 
-aka: 
+aka:
 tags:
 - user-type
 ---
-  Seseorang yang mengkonfigurasi, mengontrol, dan memonitor cluster.
+Seseorang yang mengonfigurasi, mengontrol, dan memonitor klaster.
 
-<!--more--> 
+<!--more-->
 
-
-Tanggung jawab utama mereka adalah menjaga dan menjalankan cluster, yang mungkin melibatkan kegiatan pemeliharaan berkala atau peningkatan. <br>
+Tanggung jawab utama operator klaster adalah menjaga dan menjalankan klaster, yang mungkin melibatkan kegiatan pemeliharaan berkala atau peningkatan.
 
 {{< note >}}
-Operator cluster berbeda dari [Pola operator] (https://coreos.com/operators) yang memperluas API Kubernetes.
+Operator klaster berbeda dari [pola Operator](https://coreos.com/operators) yang memperluas API Kubernetes.
 {{< /note >}}
-
diff --git a/content/id/docs/reference/glossary/cluster.md b/content/id/docs/reference/glossary/cluster.md
new file mode 100644
index 0000000000..a6722eef1e
--- /dev/null
+++ b/content/id/docs/reference/glossary/cluster.md
@@ -0,0 +1,17 @@
+---
+title: Klaster
+id: cluster
+date: 2019-06-15
+full_link: 
+short_description: >
+  Sekumpulan mesin pekerja, yang dikenal sebagai Node, yang menjalankan aplikasi dalam Container. Setiap klaster setidaknya mempunyai satu Node pekerja.
+aka:
+tags:
+- fundamental
+- operation
+---
+Sekumpulan mesin pekerja, yang dikenal sebagai {{< glossary_tooltip term_id="node" >}}, yang menjalankan aplikasi dalam Container. Setiap klaster setidaknya mempunyai satu Node pekerja.
+
+<!--more-->
+
+Node pekerja menjalankan {{< glossary_tooltip term_id="pod" >}} yang merupakan komponen dari beban kerja aplikasi. {{< glossary_tooltip term_id="control-plane" >}} mengelola Node pekerja dan Pod di dalam klaster. Pada lingkungan produksi, _control plane_ biasanya berjalan di beberapa komputer dan suatu klaster pada umumnya menjalankan beberapa Node, hal ini akan memberikan toleransi kesalahan (_fault-tolerance_) dan ketersediaan tinggi (_high availability_).