Merge pull request kubernetes#27723 from tengqm/zh-sync-kubeadm-3

[zh] Resync kubeadm files (3)
TonyGorman · May 10, 2021 · 1075bd4 · 1075bd4
2 parents 2b25d78 + 9ba6ac6
commit 1075bd4
Show file tree

Hide file tree

Showing 5 changed files with 228 additions and 72 deletions.
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/_index.md b/content/zh/docs/reference/setup-tools/kubeadm/_index.md
@@ -13,19 +13,23 @@ card:
 <!-- 
 Kubeadm is a tool built to provide `kubeadm init` and `kubeadm join` as best-practice "fast paths" for creating Kubernetes clusters.
  -->
-Kubeadm 是一个提供了 `kubeadm init` 和 `kubeadm join` 的工具，作为创建 Kubernetes 集群的 “快捷途径” 的最佳实践。
+Kubeadm 是一个提供了 `kubeadm init` 和 `kubeadm join` 的工具，
+作为创建 Kubernetes 集群的 “快捷途径” 的最佳实践。
 
 <!-- 
 kubeadm performs the actions necessary to get a minimum viable cluster up and running. By design, it cares only about bootstrapping,
 not about provisioning machines. Likewise, installing various nice-to-have addons, like the Kubernetes Dashboard, monitoring solutions, and cloud-specific addons, is not in scope.
  -->
-kubeadm 通过执行必要的操作来启动和运行最小可用集群。按照设计，它只关注启动引导，而非配置机器。同样的，安装各种 “锦上添花” 的扩展，例如 Kubernetes Dashboard,
-监控方案，以及特定云平台的扩展，都不在讨论范围内。
+kubeadm 通过执行必要的操作来启动和运行最小可用集群。
+按照设计，它只关注启动引导，而非配置机器。同样的，
+安装各种 “锦上添花” 的扩展，例如 Kubernetes Dashboard、
+监控方案、以及特定云平台的扩展，都不在讨论范围内。
 
 <!-- 
 Instead, we expect higher-level and more tailored tooling to be built on top of kubeadm, and ideally, using kubeadm as the basis of all deployments will make it easier to create conformant clusters.
  -->
-相反，我们希望在 kubeadm 之上构建更高级别以及更加合规的工具，理想情况下，使用 kubeadm 作为所有部署工作的基准将会更加易于创建一致性集群。
+相反，我们希望在 kubeadm 之上构建更高级别以及更加合规的工具，
+理想情况下，使用 kubeadm 作为所有部署工作的基准将会更加易于创建一致性集群。
 
 <!-- 
 ## How to install
@@ -34,8 +38,9 @@ Instead, we expect higher-level and more tailored tooling to be built on top of
 
 <!-- 
 To install kubeadm, see the [installation guide](/docs/setup/production-environment/tools/kubeadm/install-kubeadm).
- -->
-要安装 kubeadm, 请查阅[安装指南](/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm/).
+-->
+要安装 kubeadm, 请查阅
+[安装指南](/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm/).
 
 ## {{% heading "whatsnext" %}}
 
@@ -46,14 +51,30 @@ To install kubeadm, see the [installation guide](/docs/setup/production-environm
 * [kubeadm config](/docs/reference/setup-tools/kubeadm/kubeadm-config) if you initialized your cluster using kubeadm v1.7.x or lower, to configure your cluster for `kubeadm upgrade`
 * [kubeadm token](/docs/reference/setup-tools/kubeadm/kubeadm-token) to manage tokens for `kubeadm join`
 * [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset) to revert any changes made to this host by `kubeadm init` or `kubeadm join`
+* [kubeadm certs](/docs/reference/setup-tools/kubeadm/kubeadm-certs) to manage Kubernetes certificates
+* [kubeadm kubeconfig](/docs/reference/setup-tools/kubeadm/kubeadm-kubeconfig) to manage kubeconfig files
 * [kubeadm version](/docs/reference/setup-tools/kubeadm/kubeadm-version) to print the kubeadm version
 * [kubeadm alpha](/docs/reference/setup-tools/kubeadm/kubeadm-alpha) to preview a set of features made available for gathering feedback from the community
  -->
-* [kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init) 用于搭建控制平面节点
-* [kubeadm join](/zh/docs/reference/setup-tools/kubeadm/kubeadm-join) 用于搭建工作节点并将其加入到集群中
-* [kubeadm upgrade](/zh/docs/reference/setup-tools/kubeadm/kubeadm-upgrade) 用于升级 Kubernetes 集群到新版本
-* [kubeadm config](/zh/docs/reference/setup-tools/kubeadm/kubeadm-config) 如果你使用了 v1.7.x 或更低版本的 kubeadm 版本初始化你的集群，则使用 `kubeadm upgrade` 来配置你的集群
-* [kubeadm token](/zh/docs/reference/setup-tools/kubeadm/kubeadm-token) 用于管理 `kubeadm join` 使用的令牌
-* [kubeadm reset](/zh/docs/reference/setup-tools/kubeadm/kubeadm-reset) 用于恢复通过 `kubeadm init` 或者 `kubeadm join` 命令对节点进行的任何变更
-* [kubeadm version](/zh/docs/reference/setup-tools/kubeadm/kubeadm-version) 用于打印 kubeadm 的版本信息
-* [kubeadm alpha](/zh/docs/reference/setup-tools/kubeadm/kubeadm-alpha) 用于预览一组可用于收集社区反馈的特性
+* [kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init)
+  用于搭建控制平面节点
+* [kubeadm join](/zh/docs/reference/setup-tools/kubeadm/kubeadm-join)
+  用于搭建工作节点并将其加入到集群中
+* [kubeadm upgrade](/zh/docs/reference/setup-tools/kubeadm/kubeadm-upgrade)
+  用于升级 Kubernetes 集群到新版本
+* [kubeadm config](/zh/docs/reference/setup-tools/kubeadm/kubeadm-config)
+  如果你使用了 v1.7.x 或更低版本的 kubeadm 版本初始化你的集群，则使用
+  `kubeadm upgrade` 来配置你的集群
+* [kubeadm token](/zh/docs/reference/setup-tools/kubeadm/kubeadm-token)
+  用于管理 `kubeadm join` 使用的令牌
+* [kubeadm reset](/zh/docs/reference/setup-tools/kubeadm/kubeadm-reset)
+  用于恢复通过 `kubeadm init` 或者 `kubeadm join` 命令对节点进行的任何变更
+* [kubeadm certs](/docs/reference/setup-tools/kubeadm/kubeadm-certs)
+  用于管理 Kubernetes 证书
+* [kubeadm kubeconfig](/docs/reference/setup-tools/kubeadm/kubeadm-kubeconfig)
+  用于管理 kubeconfig 文件
+* [kubeadm version](/zh/docs/reference/setup-tools/kubeadm/kubeadm-version)
+  用于打印 kubeadm 的版本信息
+* [kubeadm alpha](/zh/docs/reference/setup-tools/kubeadm/kubeadm-alpha)
+  用于预览一组可用于收集社区反馈的特性
+
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_config_print.md b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_config_print.md
@@ -1,17 +1,30 @@
+<!--
+The file is auto-generated from the Go source code of the component using a generic
+[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
+to generate the reference documentation, please read
+[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
+To update the reference conent, please follow the 
+[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
+guide. You can file document formatting bugs against the
+[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
+-->
 
 <!--
-### Synopsis
+Print configuration
 -->
+打印配置
 
+<!--
+### Synopsis
+-->
 ### 概要
 
 <!--
 This command prints configurations for subcommands provided.
 For details, see: https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2
 -->
-
-此命令显示所提供子命令的配置。
-有关详细信息，请参阅：https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2
+此命令打印子命令所提供的配置信息。
+相关细节可参阅 https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2
 
 ```
 kubeadm config print [flags]
@@ -20,7 +33,6 @@ kubeadm config print [flags]
 <!--
 ### Options
 -->
-
 ### 选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -34,22 +46,17 @@ kubeadm config print [flags]
 <td colspan="2">-h, --help</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
-<!-- help for print -->
-print 操作的帮助命令
-</td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p><!--help for print-->print 命令的帮助信息</p></td>
 </tr>
 
 </tbody>
 </table>
 
 
-
 <!--
 ### Options inherited from parent commands
 -->
-
-### 从父命令继承的选项
+### 从父命令继承而来的选项
 
    <table style="width: 100%; table-layout: fixed;">
 <colgroup>
@@ -59,33 +66,23 @@ print 操作的帮助命令
 <tbody>
 
 <tr>
-<td colspan="2">
-<!--
---kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"
--->
---kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值："/etc/kubernetes/admin.conf"
-</td>
+<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!--Default:-->默认值："/etc/kubernetes/admin.conf"</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
-<!--
-The kubeconfig file to use when talking to the cluster. If the flag is not set, a set of standard locations can be searched for an existing kubeconfig file.
--->
-用于和集群通信的 kubeconfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
-</td>
+<!--td></td><td style="line-height: 130%; word-wrap: break-word;"><p>The kubeconfig file to use when talking to the cluster. If the flag is not set, a set of standard locations can be searched for an existing kubeconfig file.</p></td -->
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>与集群通信时使用的 kubeconfig 文件。如此标志未设置，将在一组标准位置中搜索现有的kubeconfig 文件。</p></td>
 </tr>
 
 <tr>
 <td colspan="2">--rootfs string</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
-<!--
-[EXPERIMENTAL] The path to the 'real' host root filesystem.
--->
-[实验] 到 '真实' 主机根文件系统的路径。
-</td>
+<!--td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p></td-->
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[试验性] 指向“真实”宿主根文件系统的路径。</p></td>
 </tr>
 
 </tbody>
 </table>
+
+
+
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-config.md b/content/zh/docs/reference/setup-tools/kubeadm/kubeadm-config.md
@@ -10,8 +10,8 @@ During `kubeadm init`, kubeadm uploads the `ClusterConfiguration` object to your
 in a ConfigMap called `kubeadm-config` in the `kube-system` namespace. This configuration is then read during
 `kubeadm join`, `kubeadm reset` and `kubeadm upgrade`. To view this ConfigMap call `kubeadm config view`.
 -->
-在 `kubeadm init` 执行期间，kubeadm 将 `ClusterConfiguration` 对象上传到你的集群的 `kube-system` 名字空间下
-名为 `kubeadm-config` 的 ConfigMap 对象中。
+在 `kubeadm init` 执行期间，kubeadm 将 `ClusterConfiguration` 对象上传
+到你的集群的 `kube-system` 名字空间下名为 `kubeadm-config` 的 ConfigMap 对象中。
 然后在 `kubeadm join`、`kubeadm reset` 和 `kubeadm upgrade` 执行期间读取此配置。 
 要查看此 ConfigMap，请调用 `kubeadm config view`。
 
@@ -29,22 +29,34 @@ convert your old configuration files to a newer version. `kubeadm config images
 For more information navigate to
 [Using kubeadm init with a configuration file](/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file)
 or [Using kubeadm join with a configuration file](/docs/reference/setup-tools/kubeadm/kubeadm-join/#config-file).
+-->
+更多信息请浏览[使用带配置文件的 kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file)
+或[使用带配置文件的 kubeadm join](/zh/docs/reference/setup-tools/kubeadm/kubeadm-join/#config-file).
 
+<!--
+You can also configure several kubelet-configuration options with `kubeadm init`. These options will be the same on any node in your cluster. 
+See [Configuring each kubelet in your cluster using kubeadm](/docs/setup/production-environment/tools/kubeadm/kubelet-integration/) for details.
+-->
+你也可以在使用 `kubeadm init` 命令时配置若干 kubelet 配置选项。
+这些选项对于集群中所有节点而言都是相同的。
+参阅[使用 kubeadm 来配置集群中的各个 kubelet](/zh/docs/setup/production-environment/tools/kubeadm/kubelet-integration/)
+了解详细信息。
+
+<!--
 In Kubernetes v1.13.0 and later to list/pull kube-dns images instead of the CoreDNS image
 the `--config` method described [here](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-addon)
 has to be used.
 -->
-更多信息请浏览[使用带配置文件的 kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file)
-或[使用带配置文件的 kubeadm join](/zh/docs/reference/setup-tools/kubeadm/kubeadm-join/#config-file).
-
 在 Kubernetes v1.13.0 及更高版本中，要列出/拉取 kube-dns 镜像而不是 CoreDNS 镜像，
-必须使用[这里](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-addon)所描述的 `--config` 方法。
-
-
+必须使用[这里](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-addon)
+所描述的 `--config` 方法。
 
 <!-- body -->
 ## kubeadm config upload from-file {#cmd-config-from-file}
 
+## kubeadm config print{#cmd-config-view}
+{{< include "generated/kubeadm_config_print.md" >}}
+
 ## kubeadm config print init-defaults {#cmd-config-print-init-defaults}
 {{< include "generated/kubeadm_config_print_init-defaults.md" >}}
 
@@ -60,15 +72,13 @@ has to be used.
 ## kubeadm config images pull {#cmd-config-images-pull}
 {{< include "generated/kubeadm_config_images_pull.md" >}}
 
-
-
 ## {{% heading "whatsnext" %}}
 
-
 <!--
 * [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) to upgrade a Kubernetes cluster to a newer version
 -->
 
-*  [kubeadm upgrade](/zh/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) 将 Kubernetes 集群升级到更新版本 [kubeadm upgrade]
+* [kubeadm upgrade](/zh/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/)
+  将 Kubernetes 集群升级到更新版本 [kubeadm upgrade]