Skip to content

Commit 334a083

Browse files
authored
Merge pull request #39646 from mengjiao-liu/resync-kubeadm-zh
[zh-cn] Resync kubeadm reference page
2 parents 02991a6 + 6acd310 commit 334a083

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_control-plane_apiserver.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,12 @@ Don't apply any changes; just output what would be done.
143143
<tr>
144144
<td></td><td style="line-height: 130%; word-wrap: break-word;">
145145
<!--
146-
A set of key=value pairs that describe feature gates for various features. Options are:<br/>PublicKeysECDSA=true|false (ALPHA - default=false)<br/>RootlessControlPlane=true|false (ALPHA - default=false)<br/>UnversionedKubeletConfigMap=true|false (BETA - default=true)
146+
A set of key=value pairs that describe feature gates for various features. Options are:<br/>PublicKeysECDSA=true|false (ALPHA - default=false)<br/>RootlessControlPlane=true|false (ALPHA - default=false)
147147
-->
148148
<p>
149149
一组键值对,用于描述各种功能特性的特性门控。选项是:
150150
<br/>PublicKeysECDSA=true|false (ALPHA - 默认值=false)
151151
<br/>RootlessControlPlane=true|false (ALPHA - 默认值=false)
152-
<br/>UnversionedKubeletConfigMap=true|false (BETA - 默认值=true)
153152
</p>
154153
</td>
155154
</tr>
@@ -171,9 +170,9 @@ apiserver 操作的帮助命令
171170
<tr>
172171
<td colspan="2">
173172
<!--
174-
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "k8s.gcr.io"
173+
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "registry.k8s.io"
175174
-->
176-
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:"k8s.gcr.io"
175+
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:"registry.k8s.io"
177176
</td>
178177
</tr>
179178
<tr>
@@ -212,12 +211,12 @@ Choose a specific Kubernetes version for the control plane.
212211
<tr>
213212
<td></td><td style="line-height: 130%; word-wrap: break-word;">
214213
<!--
215-
Path to a directory that contains files named &quot;target[suffix][+patchtype].extension&quot;. For example, &quot;kube-apiserver0+merge.yaml&quot; or just &quot;etcd.json&quot;. &quot;target&quot; can be one of &quot;kube-apiserver&quot;, &quot;kube-controller-manager&quot;, &quot;kube-scheduler&quot;, &quot;etcd&quot;. &quot;patchtype&quot; can be one of &quot;strategic&quot;, &quot;merge&quot; or &quot;json&quot; and they match the patch formats supported by kubectl. The default &quot;patchtype&quot; is &quot;strategic&quot;. &quot;extension&quot; must be either &quot;json&quot; or &quot;yaml&quot;. &quot;suffix&quot; is an optional string that can be used to determine which patches are applied first alpha-numerically.
214+
Path to a directory that contains files named &quot;target[suffix][+patchtype].extension&quot;. For example, &quot;kube-apiserver0+merge.yaml&quot; or just &quot;etcd.json&quot;. &quot;target&quot; can be one of &quot;kube-apiserver&quot;, &quot;kube-controller-manager&quot;, &quot;kube-scheduler&quot;, &quot;etcd&quot;, &quot;kubeletconfiguration&quot;. &quot;patchtype&quot; can be one of &quot;strategic&quot;, &quot;merge&quot; or &quot;json&quot; and they match the patch formats supported by kubectl. The default &quot;patchtype&quot; is &quot;strategic&quot;. &quot;extension&quot; must be either &quot;json&quot; or &quot;yaml&quot;. &quot;suffix&quot; is an optional string that can be used to determine which patches are applied first alpha-numerically.
216215
-->
217216
<p>
218217
包含名为 &quot;target[suffix][+patchtype].extension&quot; 的文件的目录的路径。
219218
例如,&quot;kube-apiserver0+merge.yaml&quot;或仅仅是 &quot;etcd.json&quot;
220-
&quot;target&quot; 可以是 &quot;kube-apiserver&quot;&quot;kube-controller-manager&quot;&quot;kube-scheduler&quot;&quot;etcd&quot; 之一。
219+
&quot;target&quot; 可以是 &quot;kube-apiserver&quot;&quot;kube-controller-manager&quot;&quot;kube-scheduler&quot;&quot;etcd&quot;&quot;kubeletconfiguration&quot; 之一。
221220
&quot;patchtype&quot; 可以是 &quot;strategic&quot;&quot;merge&quot; 或者 &quot;json&quot; 之一,
222221
并且它们与 kubectl 支持的补丁格式相同。
223222
默认的 &quot;patchtype&quot;&quot;strategic&quot;

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_control-plane_controller-manager.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ The file is auto-generated from the Go source code of the component using a gene
33
[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
44
to generate the reference documentation, please read
55
[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
6-
To update the reference conent, please follow the
6+
To update the reference content, please follow the
77
[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
88
guide. You can file document formatting bugs against the
99
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
@@ -105,9 +105,9 @@ Don't apply any changes; just output what would be done.
105105
<tr>
106106
<td colspan="2">
107107
<!--
108-
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "k8s.gcr.io"
108+
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "registry.k8s.ioo"
109109
-->
110-
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:"k8s.gcr.io"
110+
--image-repository string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:"registry.k8s.ioo"
111111
</td>
112112
</tr>
113113
<tr>
@@ -142,10 +142,11 @@ Don't apply any changes; just output what would be done.
142142
<tr>
143143
<td></td><td style="line-height: 130%; word-wrap: break-word;">
144144
<!--
145-
<p>Path to a directory that contains files named "target[suffix][+patchtype].extension". For example, "kube-apiserver0+merge.yaml" or just "etcd.json". "patchtype" can be one of "strategic", "merge" or "json" and they match the patch formats supported by kubectl. The default "patchtype" is "strategic". "extension" must be either "json" or "yaml". "suffix" is an optional string that can be used to determine which patches are applied first alpha-numerically.</p>
145+
<p>Path to a directory that contains files named "target[suffix][+patchtype].extension". For example, "kube-apiserver0+merge.yaml" or just "etcd.json". "target" can be one of "kube-apiserver", "kube-controller-manager", "kube-scheduler", "etcd", "kubeletconfiguration". "patchtype" can be one of "strategic", "merge" or "json" and they match the patch formats supported by kubectl. The default "patchtype" is "strategic". "extension" must be either "json" or "yaml". "suffix" is an optional string that can be used to determine which patches are applied first alpha-numerically.</p>
146146
-->
147147
<p>包含名为 "target[suffix][+patchtype].extension" 的文件的目录。
148148
例如,"kube-apiserver0+merge.yaml" 或者 "etcd.json"。
149+
"target" 可以是 "kube-apiserver"、"kube-controller-manager"、"kube-scheduler"、"etcd"、"kubeletconfiguration" 之一。
149150
"patchtype" 可以是 "strategic"、"merge" 或 "json" 之一,分别与 kubectl
150151
所支持的 patch 格式相匹配。默认的 "patchtype" 是 "strategic"。
151152
"extension" 必须是 "json" 或 "yaml"。

0 commit comments

Comments
 (0)