Merge pull request #33897 from JarHMJ/kubeadm-24

[zh] sync v1.24 kubeadm-24

Author: k8s-ci-robot

content/zh/docs/reference/setup-tools/kubeadm/implementation-details.md

@@ -166,26 +166,16 @@ Kubeadm 在启动 init 之前执行一组预检，目的是验证先决条件并
 - Kubernetes system requirements:
   - if running on linux:
     - [error] if Kernel is older than the minimum required version
-    - [error] if required cgroups subsystem aren't in set up
-  - if using docker:
-    - [warning/error] if Docker service does not exist, if it is disabled, if it is not active.
-    - [error] if Docker endpoint does not exist or does not work
-    - [warning] if docker version is not in the list of validated docker versions
-  - If using other cri engine:
-    - [error] if crictl socket does not answer
+    - [error] if required cgroups subsystem aren't set up
+- [error] if the CRI endpoint does not answer
 -->
 - [警告] 如果要使用的 Kubernetes 版本（由 `--kubernetes-version` 标志指定）比 kubeadm CLI
   版本至少高一个小版本。
 - Kubernetes 系统要求：
   - 如果在 linux上运行：
     - [错误] 如果内核早于最低要求的版本
     - [错误] 如果未设置所需的 cgroups 子系统
-  - 如果使用 docker：
-    - [警告/错误] 如果 Docker 服务不存在、被禁用或未激活。
-    - [错误] 如果 Docker 端点不存在或不起作用
-    - [警告] 如果 docker 版本不在经过验证的 docker 版本列表中
-  - 如果使用其他 cri 引擎：
-    - [错误] 如果 crictl 套接字未应答
+- [错误] 如果 CRI 端点未应答
 <!--  
 - [error] if user is not root
 - [error] if the machine hostname is not a valid DNS subdomain
@@ -745,18 +735,20 @@ As soon as the control plane is available, kubeadm executes following actions:
 一旦控制平面可用，kubeadm 将执行以下操作：
 
 <!-- 
-- Labels the node as control-plane with `node-role.kubernetes.io/master=""`
-- Taints the node with `node-role.kubernetes.io/master:NoSchedule`
+- Labels the node as control-plane with `node-role.kubernetes.io/control-plane=""`
+- Taints the node with `node-role.kubernetes.io/master:NoSchedule` and `node-role.kubernetes.io/control-plane:NoSchedule`
 -->
-- 给节点打上 `node-role.kubernetes.io/master=""` 标签，标记其为控制平面
-- 给节点打上 `node-role.kubernetes.io/master:NoSchedule` 污点
+- 给节点打上 `node-role.kubernetes.io/control-plane=""` 标签，标记其为控制平面
+- 给节点打上 `node-role.kubernetes.io/master:NoSchedule` 和 `node-role.kubernetes.io/control-plane:NoSchedule` 污点
 
 <!-- Please note that: -->
 请注意：
 
 <!-- 
+1. The `node-role.kubernetes.io/master` taint is deprecated and will be removed in kubeadm version 1.25
 1. Mark control-plane phase can be invoked individually with the [`kubeadm init phase mark-control-plane`](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-mark-control-plane) command
 -->
+1. `node-role.kubernetes.io/master` 污点是已废弃的，将会在 kubeadm 1.25 版本中移除
 1. 可以使用 [`kubeadm init phase mark-control-plane`](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-mark-control-plane) 
   命令单独触发控制平面标记
 
@@ -1026,14 +1018,12 @@ cluster startup problems.
 
 <!--  
 1. `kubeadm join` preflight checks are basically a subset `kubeadm init` preflight checks
-1. Starting from 1.9, kubeadm provides better support for CRI-generic functionality; in that case, docker specific controls
-   are skipped or replaced by similar controls for crictl.
+1. Starting from 1.24, kubeadm uses crictl to communicate to all known CRI endpoints.
 1. Starting from 1.9, kubeadm provides support for joining nodes running on Windows; in that case, linux specific controls are skipped.
 1. In any case the user can skip specific preflight checks (or eventually all preflight checks) with the `--ignore-preflight-errors` option.
 -->
 1. `kubeadm join` 预检基本上是 `kubeadm init` 预检的一个子集
-2. 从 1.9 开始，kubeadm 为 CRI 通用的功能提供了更好的支持；在这种情况下，
-   Docker 特定的控制参数将跳过或替换为 crictl 中与之相似的控制参数。
+2. 从 1.24 开始，kubeadm 使用 crictl 与所有已知的 CRI 端点进行通信。
 3. 从 1.9 开始，kubeadm 支持加入在 Windows 上运行的节点；在这种情况下，
    将跳过 Linux 特定的控制参数。
 4. 在任何情况下，用户都可以通过 `--ignore-preflight-errors` 选项跳过

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

@@ -8,53 +8,59 @@ weight: 50
 <!--
 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`.
+`kubeadm join`, `kubeadm reset` and `kubeadm upgrade`.
 -->
 在 `kubeadm init` 执行期间，kubeadm 将 `ClusterConfiguration` 对象上传
 到你的集群的 `kube-system` 名字空间下名为 `kubeadm-config` 的 ConfigMap 对象中。
 然后在 `kubeadm join`、`kubeadm reset` 和 `kubeadm upgrade` 执行期间读取此配置。 
-要查看此 ConfigMap，请调用 `kubeadm config view`。
 
 <!--
-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.
+You can use `kubeadm config print` to print the default static configuration that kubeadm
+uses for `kubeadm init` and `kubeadm join`.
 -->
-你可以使用 `kubeadm config print` 命令打印默认配置，
-并使用 `kubeadm config migrate` 命令将旧版本的配置转化成新版本。
-`kubeadm config images list` 和 `kubeadm config images pull`
-命令可以用来列出并拉取 kubeadm 所需的镜像。
+你可以使用 `kubeadm config print` 命令打印默认静态配置，
+kubeadm 运行 `kubeadm init` and `kubeadm join` 时将使用此配置。
+
+<!-- 
+The output of the command is meant to serve as an example. You must manually edit the output
+of this command to adapt to your setup. Remove the fields that you are not certain about and kubeadm
+will try to default them on runtime by examining the host. 
+-->
+{{< note >}}
+此命令的输出旨在作为示例。你必须手动编辑此命令的输出来适配你的设置。
+删除你不确定的字段，kubeadm 将通过检查主机来尝试在运行时给它们设默认值。
+{{< /note >}}
 
 <!--
-For more information navigate to
+For more information on `init` and `join` 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).
+更多有关 `init` 和 `join` 的信息请浏览[使用带配置文件的 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.
+For more information on using the kubeadm configuration API navigate to
+[Customizing components with the kubeadm API](/docs/setup/production-environment/tools/kubeadm/control-plane-flags).
 -->
-你也可以在使用 `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 的配置 API 的更多信息，
+请浏览[使用 kubeadm API 来自定义组件](/zh/docs/setup/production-environment/tools/kubeadm/control-plane-flags)。
+
+<!-- 
+You can use `kubeadm config migrate` to convert your old configuration files that contain a deprecated
+API version to a newer, supported API version. 
 -->
-在 Kubernetes v1.13.0 及更高版本中，要列出/拉取 kube-dns 镜像而不是 CoreDNS 镜像，
-必须使用[这里](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init-phase/#cmd-phase-addon)
-所描述的 `--config` 方法。
+你可以使用 `kubeadm config migrate` 来转换旧配置文件，
+把其中已弃用的 API 版本更新为受支持的 API 版本。
 
-<!-- body -->
-## kubeadm config upload from-file {#cmd-config-from-file}
+<!-- 
+`kubeadm config images list` and `kubeadm config images pull` can be used to list and pull the images
+that kubeadm requires. 
+-->
+`kubeadm config images list` 和 `kubeadm config images pull` 可以用来列出和拉取 kubeadm 所需的镜像。
 
-## kubeadm config print{#cmd-config-view}
+<!-- body -->
+## kubeadm config print {#cmd-config-print}
 {{< include "generated/kubeadm_config_print.md" >}}
 
 ## kubeadm config print init-defaults {#cmd-config-print-init-defaults}