Merge pull request #25275 from howieyuen/kubeadm

[zh] sync changes in docs/reference/setup-tools/kubeadm/ directory

Author: k8s-ci-robot

content/zh/docs/reference/setup-tools/kubeadm/kubeadm-alpha.md

@@ -23,13 +23,25 @@ weight: 90
  `kubeadm alpha` 提供了一组可用于收集社区反馈的功能的预览。请尝试一下这些功能并给我们反馈！
 {{< /caution >}}
 
+## kubeadm alpha certs {#cmd-certs}
+
+<!-- A collection of operations for operating Kubernetes certificates. -->
+Kubernetes 证书的操作集合。
+
+{{< tabs name="tab-certs" >}}
+{{< tab name="overview" include="generated/kubeadm_alpha_certs.md" />}}
+{{< /tabs >}}
+
+
 ## kubeadm alpha certs renew {#cmd-certs-renew}
 
 <!--
 You can renew all Kubernetes certificates using the `all` subcommand or renew them selectively.
 For more details about certificate expiration and renewal see the [certificate management documentation](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/).
 -->
-使用 `all` 子命令来更新所有 Kubernetes 证书或有选择性地更新它们。有关证书到期和续订的更多详细信息，请参见[证书管理文档](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/)。
+使用 `all` 子命令来更新所有 Kubernetes 证书或有选择性地更新它们。
+有关证书到期和续订的更多详细信息，
+请参见[证书管理文档](/zh/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/)。
 
 {{< tabs name="tab-certs-renew" >}}
 {{< tab name="renew" include="generated/kubeadm_alpha_certs_renew.md" />}}
@@ -53,19 +65,34 @@ This command can be used to generate a new control-plane certificate key.
 The key can be passed as `--certificate-key` to `kubeadm init` and `kubeadm join`
 to enable the automatic copy of certificates when joining additional control-plane nodes.
 -->
-该命令可用于生成新的控制平面证书密钥。密钥可以作为 `--certificate-key` 参数传递给 `kubeadm init` 和 `kubeadm join` 操作，以在加入其他控制平面节点时启用证书的自动复制。
+该命令可用于生成新的控制平面证书密钥。
+密钥可以作为 `--certificate-key` 参数传递给 `kubeadm init` 和 `kubeadm join` 操作，
+以在加入其他控制平面节点时启用证书的自动复制。
 
 {{< tabs name="tab-certs-certificate-key" >}}
 {{< tab name="certificate-key" include="generated/kubeadm_alpha_certs_certificate-key.md" />}}
 {{< /tabs >}}
 
+## kubeadm alpha certs generate-csr {#cmd-certs-generate-csr}
+
+<!-- 
+This command can be used to generate certificate signing requests (CSRs) which
+can be submitted to a certificate authority (CA) for signing.
+-->
+该命令可用于生成证书签名请求（CSR），CSR 可以将其提交给证书颁发机构（CA）进行签名。
+
+{{< tabs name="tab-certs-generate-csr" >}}
+{{< tab name="certificate-generate-csr" include="generated/kubeadm_alpha_certs_generate-csr.md" />}}
+{{< /tabs >}}
+
 ## kubeadm alpha certs check-expiration {#cmd-certs-check-expiration}
 
 <!--
 This command checks expiration for the certificates in the local PKI managed by kubeadm.
 For more details about certificate expiration and renewal see the [certificate management documentation](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/).
 -->
-此命令检查 kubeadm 管理的本地 PKI 中证书的到期时间。有关证书到期和续订的更多详细信息，请参见[证书管理文档](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/)。
+此命令检查 kubeadm 管理的本地 PKI 中证书的到期时间。
+有关证书到期和续订的更多详细信息，请参见[证书管理文档](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/)。
 
 {{< tabs name="tab-certs-check-expiration" >}}
 {{< tab name="check-expiration" include="generated/kubeadm_alpha_certs_check-expiration.md" />}}
@@ -101,7 +128,7 @@ Use the following command to enable the DynamicKubeletConfiguration feature.
 <!--
 The subcommand `pivot` can be used to convert a static Pod-hosted control plane into a self-hosted one.
 -->
-子命令 `pivot` 可用于将 Pod 托管的静态控制平面转换为自托管的控制平面。有关 `pivot` 更多信息，请参见[文档](/docs/setup/production-environment/tools/kubeadm/self-hosting/)。
+子命令 `pivot` 可用于将 Pod 托管的静态控制平面转换为自托管的控制平面。有关 `pivot` 更多信息，请参见[文档](zh/docs/setup/production-environment/tools/kubeadm/self-hosting/)。
 
 <!--
 [Documentation](/docs/setup/production-environment/tools/kubeadm/self-hosting/)
@@ -120,6 +147,6 @@ The subcommand `pivot` can be used to convert a static Pod-hosted control plane
 * [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) to connect a node to the cluster
 * [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset/) to revert any changes made to this host by `kubeadm init` or `kubeadm join`
 -->
-* [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) 引导 Kubernetes 控制平面节点
-* [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) 将节点连接到集群
-* [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset/) 会还原 `kubeadm init` 或 `kubeadm join` 操作对主机所做的任何更改。
+* [kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/) 引导 Kubernetes 控制平面节点
+* [kubeadm join](/zh/docs/reference/setup-tools/kubeadm/kubeadm-join/) 将节点连接到集群
+* [kubeadm reset](/zh/docs/reference/setup-tools/kubeadm/kubeadm-reset/) 会还原 `kubeadm init` 或 `kubeadm join` 操作对主机所做的任何更改。

content/zh/docs/reference/setup-tools/kubeadm/kubeadm-config.md

@@ -6,32 +6,39 @@ weight: 50
 
 <!-- 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.
+During `kubeadm init`, kubeadm uploads the `ClusterConfiguration` object to your cluster
+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`.
 -->
-
-从 v1.8.0 开始，kubeadm 将集群的配置上传到名为 kube-system 的 ConfigMap 对象中，对象位于 kube-system 命名空间内。并在以后的升级中读取这个 ConfigMap 配置对象。
-这样可以保证系统组件的正确配置，提供无缝的用户体验。
+在 `kubeadm init` 执行期间，kubeadm 将 `ClusterConfiguration` 对象上传到你的集群的 `kube-system` 名字空间下
+名为 `kubeadm-config` 的 ConfigMap 对象中。
+然后在 `kubeadm join`、`kubeadm reset` 和 `kubeadm upgrade` 执行期间读取此配置。 
+要查看此 ConfigMap，请调用 `kubeadm config view`。
 
 <!--
-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`.
+You can use `kubeadm config print` 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.
 -->
-
-您可以执行 kubeadm config view 来查看 ConfigMap。如果使用 kubeadm v1.7.x 或更低版本来初始化群集，必须先使用 kubeadm config upload 创建 ConfigMap，然后才能使用 kubeadm upgrade。
+你可以使用 `kubeadm config print` 命令打印默认配置，
+并使用 `kubeadm config migrate` 命令将旧版本的配置转化成新版本。
+`kubeadm config images list` 和 `kubeadm config images pull`
+命令可以用来列出并拉取 kubeadm 所需的镜像。
 
 <!--
-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.
+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).
+
+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.11.0 中，添加了一些新命令。你可以使用 kubeadm config print-default
-打印默认配置，可以用 kubeadm config migrate 来将旧的配置文件转换到较新的版本，还可以使用 kubeadm config images list 和 kubeadm config images pull
-列出并拉取 kubeadm 所需的镜像。
+在 Kubernetes v1.13.0 及更高版本中，要列出/拉取 kube-dns 镜像而不是 CoreDNS 镜像，
+必须使用[这里](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-addon)所描述的 `--config` 方法。
 
 
 
@@ -65,6 +72,6 @@ to list and pull the images that kubeadm requires.
 * [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) to upgrade a Kubernetes cluster to a newer version
 -->
 
-*  [kubeadm upgrade](/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) 将 Kubernetes 集群升级到更新版本 [kubeadm upgrade]
+*  [kubeadm upgrade](/zh/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) 将 Kubernetes 集群升级到更新版本 [kubeadm upgrade]
 
 

content/zh/docs/reference/setup-tools/kubeadm/kubeadm-init-phase.md

@@ -23,7 +23,7 @@ if you wish to apply customization.
 `kubeadm init phase` is consistent with the [kubeadm init workflow](/docs/reference/setup-tools/kubeadm/kubeadm-init/#init-workflow),
 and behind the scene both use the same code.
 -->
-`kubeadm init phase` 与 [kubeadm init 工作流程](/docs/reference/setup-tools/kubeadm/kubeadm-init/#init-workflow)一致，后台都使用相同的代码。
+`kubeadm init phase` 与 [kubeadm init 工作流](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/#init-workflow)一致，后台都使用相同的代码。
 
 <!--
 ## kubeadm init phase preflight {#cmd-phase-preflight}
@@ -143,7 +143,7 @@ Use the following phase to create a local etcd instance based on a static Pod fi
 You can use this command to upload the kubeadm configuration to your cluster.
 Alternatively, you can use [kubeadm config](/docs/reference/setup-tools/kubeadm/kubeadm-config/).
 -->
-可以使用此命令将 kubeadm 配置文件上传到集群。或者，使用 [kubeadm config](/docs/reference/setup-tools/kubeadm/kubeadm-config/) 方式。
+可以使用此命令将 kubeadm 配置文件上传到集群。或者使用 [kubeadm config](/zh/docs/reference/setup-tools/kubeadm/kubeadm-config/)。
 
 {{< tabs name="upload-config" >}}
 {{< tab name="upload-config" include="generated/kubeadm_init_phase_upload-config.md" />}}
@@ -198,6 +198,21 @@ Use the following phase to configure bootstrap tokens.
 {{< tab name="bootstrap-token" include="generated/kubeadm_init_phase_bootstrap-token.md" />}}
 {{< /tabs >}}
 
+## kubeadm init phase kubelet-finialize {#cmd-phase-kubelet-finalize-all}
+
+<!-- 
+Use the following phase to update settings relevant to the kubelet after TLS
+bootstrap. You can use the `all` subcommand to run all `kubelet-finalize`
+phases.
+-->
+使用以下阶段在 TLS 引导后更新与 kubelet 相关的设置。
+你可以使用 `all` 子命令来运行所有 `kubelet-finalize` 阶段。
+
+{{< tabs name="tab-kubelet-finalize" >}}
+{{< tab name="kublet-finalize" include="generated/kubeadm_init_phase_kubelet-finalize.md" />}}
+{{< tab name="kublet-finalize-all" include="generated/kubeadm_init_phase_kubelet-finalize_all.md" />}}
+{{< tab name="kublet-finalize-cert-rotation" include="generated/kubeadm_init_phase_kubelet-finalize_experimental-cert-rotation.md" />}}
+{{< /tabs >}}
 
 <!--
 ## kubeadm init phase addon {#cmd-phase-addon}
@@ -270,7 +285,7 @@ For more details on each field in the `v1beta2` configuration you can navigate t
 * [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset/) to revert any changes made to this host by `kubeadm init` or `kubeadm join`
 * [kubeadm alpha](/docs/reference/setup-tools/kubeadm/kubeadm-alpha/) to try experimental functionality
 -->
-* [kubeadm init](/docs/reference/setup-tools/kubeadm/kubeadm-init/) 引导 Kubernetes 控制平面节点
-* [kubeadm join](/docs/reference/setup-tools/kubeadm/kubeadm-join/) 将节点连接到集群
-* [kubeadm reset](/docs/reference/setup-tools/kubeadm/kubeadm-reset/) 恢复通过 `kubeadm init` 或 `kubeadm join` 操作对主机所做的任何更改
-* [kubeadm alpha](/docs/reference/setup-tools/kubeadm/kubeadm-alpha/) 尝试实验性功能
+* [kubeadm init](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init/) 引导 Kubernetes 控制平面节点
+* [kubeadm join](/zh/docs/reference/setup-tools/kubeadm/kubeadm-join/) 将节点连接到集群
+* [kubeadm reset](/zh/docs/reference/setup-tools/kubeadm/kubeadm-reset/) 恢复通过 `kubeadm init` 或 `kubeadm join` 操作对主机所做的任何更改
+* [kubeadm alpha](/zh/docs/reference/setup-tools/kubeadm/kubeadm-alpha/) 尝试实验性功能