From 73ba2c97a2050767cdf54b74be67db246bdb465f Mon Sep 17 00:00:00 2001
From: congfairy <congfairy@users.noreply.github.com>
Date: Tue, 11 Dec 2018 16:10:17 +0800
Subject: [PATCH 1/2] zh_trans: kubeadm-config.md

---
 .../setup-tools/kubeadm/kubeadm-config.md     | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md

diff --git a/content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md b/content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md
new file mode 100644
index 0000000000000..265f39204fc0e
--- /dev/null
+++ b/content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md
@@ -0,0 +1,69 @@
+---
+reviewers:
+- mikedanese
+- luxas
+- jbeda
+title: kubeadm config
+content_template: templates/concept
+weight: 50
+---
+<!--
+{{% capture overview %}}
+Beginning with v1.8.0, kubeadm uploads the configuration of your cluster to a ConfigMap called
+`kubeadm-config` in the `kube-system` namespace, and later reads the ConfigMap when upgrading.
+This enables correct configuration of system components, and provides a seamless user experience.
+-->
+
+{{％capture overview％}}
+从v1.8.0开始，kubeadm 将集群的配置上传到名为 `kube-system`的 ConfigMap 中，其在`kubeadm-config` 命名空间，稍后在升级时读取ConfigMap。
+这样可以正确配置系统组件，并提供无缝的用户体验。
+
+<!--
+You can execute `kubeadm config view` to view the ConfigMap. If you initialized your cluster using
+kubeadm v1.7.x or lower, you must use `kubeadm config upload` to create the ConfigMap before you
+may use `kubeadm upgrade`.
+-->
+
+您可以执行`kubeadm config view`来查看ConfigMap。如果使用kubeadm v1.7.x或更低版本来初始化群集
+，您必须在使用`kubeadm upgrade`前先使用`kubeadm config upload`创建ConfigMap。
+
+<!--
+In Kubernetes v1.11.0, some new commands were added. You can use `kubeadm config print-default`
+to print the default configuration and `kubeadm config migrate` to convert your old configuration
+files to a newer version. `kubeadm config images list` and `kubeadm config images pull` can be used
+to list and pull the images that kubeadm requires.
+-->
+
+在Kubernetes v1.11.0中，添加了一些新命令。你可以使用`kubeadm config print-default`
+打印默认配置,也可以用 `kubeadm config migrate` 来将就配置文件转换到较新的版本。可以使用`kubeadm config images list`和`kubeadm config images pull`
+列出并拉取 kubeadm 所需的镜像。
+
+
+{{% /capture %}}
+
+{{% capture body %}}
+## kubeadm config upload from-file {#cmd-config-from-file}
+{{< include "generated/kubeadm_config_upload_from-file.md" >}}
+
+{{< include "generated/kubeadm_config_upload_from-flags.md" >}}
+
+## kubeadm config view {#cmd-config-view}
+{{< include "generated/kubeadm_config_view.md" >}}
+
+## kubeadm config print-default {#cmd-config-print-default}
+{{< include "generated/kubeadm_config_print-default.md" >}}
+
+## kubeadm config migrate {#cmd-config-migrate}
+{{< include "generated/kubeadm_config_migrate.md" >}}
+
+## kubeadm config images list {#cmd-config-images-list}
+{{< include "generated/kubeadm_config_images_list.md" >}}
+
+## kubeadm config images pull {#cmd-config-images-pull}
+{{< include "generated/kubeadm_config_images_pull.md" >}}
+
+{{% /capture %}}
+
+{{% capture whatsnext %}}
+* [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) to upgrade a Kubernetes cluster to a newer version
+{{% /capture %}}

From 9923c3e69cd14d6a05cb178bafdc23a17849d4f1 Mon Sep 17 00:00:00 2001
From: congfairy <congfairy@users.noreply.github.com>
Date: Wed, 12 Dec 2018 12:39:32 +0800
Subject: [PATCH 2/2] Update kubeadm-config.md

---
 .../setup-tools/kubeadm/kubeadm-config.md     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md b/content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md
index 265f39204fc0e..028ca9963ad1a 100644
--- a/content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md
+++ b/content/cn/docs/reference/setup-tools/kubeadm/kubeadm-config.md
@@ -15,8 +15,8 @@ This enables correct configuration of system components, and provides a seamless
 -->
 
 {{％capture overview％}}
-从v1.8.0开始，kubeadm 将集群的配置上传到名为 `kube-system`的 ConfigMap 中，其在`kubeadm-config` 命名空间，稍后在升级时读取ConfigMap。
-这样可以正确配置系统组件，并提供无缝的用户体验。
+从 v1.8.0 开始，kubeadm 将集群的配置上传到名为 kube-system 的 ConfigMap 对象中，对象位于 kube-system 命名空间内。并在以后的升级中读取这个 ConfigMap 配置对象。
+这样可以保证系统组件的正确配置，提供无缝的用户体验。
 
 <!--
 You can execute `kubeadm config view` to view the ConfigMap. If you initialized your cluster using
@@ -24,8 +24,7 @@ kubeadm v1.7.x or lower, you must use `kubeadm config upload` to create the Conf
 may use `kubeadm upgrade`.
 -->
 
-您可以执行`kubeadm config view`来查看ConfigMap。如果使用kubeadm v1.7.x或更低版本来初始化群集
-，您必须在使用`kubeadm upgrade`前先使用`kubeadm config upload`创建ConfigMap。
+您可以执行 kubeadm config view 来查看 ConfigMap。如果使用 kubeadm v1.7.x 或更低版本来初始化群集，必须先使用 kubeadm config upload 创建 ConfigMap，然后才能使用 kubeadm upgrade。
 
 <!--
 In Kubernetes v1.11.0, some new commands were added. You can use `kubeadm config print-default`
@@ -34,11 +33,10 @@ files to a newer version. `kubeadm config images list` and `kubeadm config image
 to list and pull the images that kubeadm requires.
 -->
 
-在Kubernetes v1.11.0中，添加了一些新命令。你可以使用`kubeadm config print-default`
-打印默认配置,也可以用 `kubeadm config migrate` 来将就配置文件转换到较新的版本。可以使用`kubeadm config images list`和`kubeadm config images pull`
+在 Kubernetes v1.11.0 中，添加了一些新命令。你可以使用 kubeadm config print-default
+打印默认配置,也可以用 kubeadm config migrate 来将就配置文件转换到较新的版本。可以使用 kubeadm config images list 和 kubeadm config images pull
 列出并拉取 kubeadm 所需的镜像。
 
-
 {{% /capture %}}
 
 {{% capture body %}}
@@ -65,5 +63,12 @@ to list and pull the images that kubeadm requires.
 {{% /capture %}}
 
 {{% capture whatsnext %}}
+
+<!--
 * [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) to upgrade a Kubernetes cluster to a newer version
 {{% /capture %}}
+-->
+
+*  [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/)将Kubernetes集群升级到更新版本[kubeadm upgrade]
+{{% /capture %}}
+