Merge pull request #49539 from my-git9/np-2598

[zh-cn]sync kubeadm_config/* kubeadm_init/*
2025-01-23 23:41:21 -08:00 · 2025-01-23 23:41:21 -08:00 · d9db8c0866
parent ede181f7bc b3a4beb2f3
commit d9db8c0866
4 changed files with 60 additions and 49 deletions
--- a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_config/kubeadm_config_images_list.md
+++ b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_config/kubeadm_config_images_list.md
@ -13,7 +13,7 @@ Print a list of images kubeadm will use. The configuration file is used in case
 -->
 打印 kubeadm 要使用的镜像列表。配置文件用于自定义镜像或镜像存储库。

-```
+```shell
 kubeadm config images list [flags]
 ```

@ -22,7 +22,7 @@ kubeadm config images list [flags]
 -->
 ### 选项

-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@ -37,10 +37,10 @@ kubeadm config images list [flags]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!-- 
 If true, ignore any errors in templates when a field or map key is missing in the template. Only applies to golang and jsonpath output formats.
 -->
-<p>
 如果设置为 true，则在模板中缺少字段或哈希表的键时忽略模板中的任何错误。
 仅适用于 golang 和 jsonpath 输出格式。
 </p>
@ -52,10 +52,10 @@ If true, ignore any errors in templates when a field or map key is missing in th
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Path to a kubeadm configuration file.
 -->
-<p>
 kubeadm 配置文件的路径。
 </p>
 </td>
@ -82,20 +82,20 @@ Output format. One of: text|json|yaml|go-template|go-template-file|template|temp
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 A set of key=value pairs that describe feature gates for various features. Options are:<br/>
+ControlPlaneKubeletLocalMode=true|false (ALPHA - default=false)<br/>
 EtcdLearnerMode=true|false (BETA - default=true)<br/>
 PublicKeysECDSA=true|false (DEPRECATED - default=false)<br/>
 RootlessControlPlane=true|false (ALPHA - default=false)<br/>
-UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)<br/>
-WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)
+WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)</p>
 -->
-<p>
 一组键值对（key=value），用于描述各种特性。这些选项是：<br/>
+ControlPlaneKubeletLocalMode=true|false (ALPHA - 默认值=false)<br/>
 EtcdLearnerMode=true|false (BETA - 默认值=true)<br/>
 PublicKeysECDSA=true|false (DEPRECATED - 默认值=false)<br/>
 RootlessControlPlane=true|false (ALPHA - 默认值=false)<br/>
-UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)<br/>
 WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
 </p>
 </td>
@ -106,10 +106,10 @@ WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 help for list
 -->
-<p>
 list 操作的帮助命令。
 </p>
 </td>
@ -125,10 +125,10 @@ list 操作的帮助命令。
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Choose a container registry to pull control plane images from
 -->
-<p>
 选择要从中拉取控制平面镜像的容器仓库。
 </p>
 </td>
@ -144,10 +144,10 @@ Choose a container registry to pull control plane images from
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Choose a specific Kubernetes version for the control plane.
 -->
-<p>
 为控制平面选择一个特定的 Kubernetes 版本。
 </p>
 </td>
@ -163,10 +163,10 @@ Choose a specific Kubernetes version for the control plane.
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 If true, keep the managedFields when printing objects in JSON or YAML format.
 -->
-<p>
 如果为 true，则在以 JSON 或 YAML 格式打印对象时保留 managedFields。
 </p>
 </td>
@ -180,7 +180,7 @@ If true, keep the managedFields when printing objects in JSON or YAML format.
 -->
 ### 从父命令继承的选项

-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@ -197,11 +197,12 @@ If true, keep the managedFields when printing objects in JSON or YAML format.
 </tr>
 <tr>
 <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>
-用于和集群通信的 kubeconfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
+用于和集群通信的 kubeconfig 文件。如果它没有被设置，那么 kubeadm
+将会搜索一个已经存在于标准路径的 kubeconfig 文件。
 </p>
 </td>
 </tr>
@ -211,10 +212,10 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
-<p>
 [实验] 到“真实”主机根文件系统的路径。
 </p>
 </td>
--- a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_config/kubeadm_config_images_pull.md
+++ b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_config/kubeadm_config_images_pull.md
@ -13,7 +13,7 @@ Pull images used by kubeadm.
 -->
 拉取 kubeadm 使用的镜像。

-```
+```shell
 kubeadm config images pull [flags]
 ```

@ -22,7 +22,7 @@ kubeadm config images pull [flags]
 -->
 ### 选项

-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@ -34,10 +34,10 @@ kubeadm config images pull [flags]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Path to a kubeadm configuration file.
 -->
-<p>
 kubeadm 配置文件的路径。
 </p>
 </td>
@ -48,10 +48,10 @@ kubeadm 配置文件的路径。
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this value; use this option only if you have more than one CRI installed or if you have non-standard CRI socket.
 -->
-<p>
 要连接的 CRI 套接字的路径。如果为空，则 kubeadm 将尝试自动检测此值；仅当安装了多个 CRI 或具有非标准 CRI 插槽时，才使用此选项。
 </p>
 </td>
@ -62,20 +62,22 @@ Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 A set of key=value pairs that describe feature gates for various features. Options are:<br/>
+ControlPlaneKubeletLocalMode=true|false (ALPHA - default=false)<br/>
 EtcdLearnerMode=true|false (BETA - default=true)<br/>
 PublicKeysECDSA=true|false (DEPRECATED - default=false)<br/>
 RootlessControlPlane=true|false (ALPHA - default=false)<br/>
-UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)<br/>
 WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)
 -->
 一系列键值对（key=value），用于描述各种特性。可选项是：<br/>
+ControlPlaneKubeletLocalMode=true|false (ALPHA - 默认值=false)<br/>
 EtcdLearnerMode=true|false (BETA - 默认值=true)<br/>
 PublicKeysECDSA=true|false (DEPRECATED - 默认值=false)<br/>
 RootlessControlPlane=true|false (ALPHA - 默认值=false)<br/>
-UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)<br/>
 WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
+</p>
 </td>
 </tr>

@ -84,10 +86,10 @@ WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 help for pull
 -->
-<p>
 pull 操作的帮助命令。
 </p>
 </td>
@ -103,10 +105,10 @@ pull 操作的帮助命令。
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Choose a container registry to pull control plane images from
 -->
-<p>
 选择用于拉取控制平面镜像的容器仓库。
 </p>
 </td>
@ -122,10 +124,10 @@ Choose a container registry to pull control plane images from
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Choose a specific Kubernetes version for the control plane.
 -->
-<p>
 为控制平面选择一个特定的 Kubernetes 版本。
 </p>
 </td>
@ -139,7 +141,7 @@ Choose a specific Kubernetes version for the control plane.
 -->
 ### 从父命令继承的选项

-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@ -156,11 +158,12 @@ Choose a specific Kubernetes version for the control plane.
 </tr>
 <tr>
 <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>
-用于和集群通信的 kubeconfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
+用于和集群通信的 kubeconfig 文件。如果它没有被设置，那么 kubeadm
+将会搜索一个已经存在于标准路径的 kubeconfig 文件。
 </p>
 </td>
 </tr>
@ -170,11 +173,11 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
-<p>
-[实验] 到 '真实' 主机根文件系统的路径。
+[实验] 到'真实'主机根文件系统的路径。
 </p>
 </td>
 </tr>
--- a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init/kubeadm_init_phase_control-plane.md
+++ b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init/kubeadm_init_phase_control-plane.md
@ -9,11 +9,11 @@ Generate all static Pod manifest files necessary to establish the control plane
 ### 概要

 <!--
-This command is not meant to be run on its own. See list of available subcommands.
+Generate all static Pod manifest files necessary to establish the control plane
 -->
-此命令并非设计用来单独运行。请参阅可用子命令列表。
+生成建立控制平面所需的所有静态 Pod 的清单文件

-```
+```shell
 kubeadm init phase control-plane [flags]
 ```

@ -22,7 +22,7 @@ kubeadm init phase control-plane [flags]
 -->
 ### 选项

-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@ -34,10 +34,12 @@ kubeadm init phase control-plane [flags]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!-- 
-<p>help for control-plane</p> 
+help for control-plane
 -->
-<p>control-plane 操作的帮助命令。</p>
+control-plane 操作的帮助命令。
+</p>
 </td>
 </tr>

@ -49,7 +51,7 @@ kubeadm init phase control-plane [flags]
 -->
 ### 继承于父命令的选项

-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@ -61,11 +63,12 @@ kubeadm init phase control-plane [flags]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!-- 
-<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>  
+[EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
-<p>[实验] 到 '真实' 主机根文件系统的路径。</p>
-</td>
+[实验] 到'真实'主机根文件系统的路径。
+</p>
 </td>
 </tr>

--- a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init/kubeadm_init_phase_kubeconfig.md
+++ b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init/kubeadm_init_phase_kubeconfig.md
@ -9,11 +9,11 @@ Generate all kubeconfig files necessary to establish the control plane and the a
 ### 概要

 <!-- 
-This command is not meant to be run on its own. See list of available subcommands. 
+Generate all kubeconfig files necessary to establish the control plane and the admin kubeconfig file
 -->
-此命令并非设计用来单独运行。请阅读可用子命令列表。
+生成建立控制平面和管理 kubeconfig 文件所需的所有 kubeconfig 文件

-```
+```shell
 kubeadm init phase kubeconfig [flags]
 ```

@ -22,7 +22,7 @@ kubeadm init phase kubeconfig [flags]
 -->
 ### 选项

-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@ -34,10 +34,12 @@ kubeadm init phase kubeconfig [flags]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
-<p>help for kubeconfig</p>
+help for kubeconfig
 -->
-<p>kubeconfig 操作的帮助命令</p>
+kubeconfig 操作的帮助命令
+</p>
 </td>
 </tr>

@ -49,7 +51,7 @@ kubeadm init phase kubeconfig [flags]
 -->
 ### 从父命令继承的选项

-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@ -61,10 +63,12 @@ kubeadm init phase kubeconfig [flags]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
-<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
+[EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
-<p>[实验] 到 '真实' 主机根文件系统的路径。</p>
+[实验] 到'真实'主机根文件系统的路径。
+</p>
 </td>
 </tr>