Skip to content

Commit 112bdf1

Browse files
authored
Merge pull request #40205 from asa3311/Reference-files-to-sync-task-9
[zh-cn]Reference files to sync task 9
2 parents fbeadc1 + 138fc4f commit 112bdf1

File tree

4 files changed

+35
-7
lines changed

4 files changed

+35
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
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.

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-join_etcd.md

Lines changed: 18 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.
@@ -63,7 +63,7 @@ If the node should host a new control plane instance, the IP address the API Ser
6363
<tr>
6464
<td></td><td style="line-height: 130%; word-wrap: break-word;">
6565
<!--
66-
Path to kubeadm configuration file.
66+
Path to a kubeadm configuration file.
6767
-->
6868
<p>
6969
kubeadm 配置文件的路径。
@@ -85,6 +85,20 @@ Create a new control plane instance on this node
8585
</td>
8686
</tr>
8787

88+
<tr>
89+
<td colspan="2">--dry-run</td>
90+
</tr>
91+
<tr>
92+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
93+
<!--
94+
Don't apply any changes; just output what would be done.
95+
-->
96+
<p>
97+
不做任何更改;只输出将要执行的操作。。
98+
</p>
99+
</td>
100+
</tr>
101+
88102
<tr>
89103
<td colspan="2">-h, --help</td>
90104
</tr>
@@ -117,10 +131,10 @@ Specify the node name.
117131
</tr>
118132
<tr>
119133
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
120-
<!-- 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. -->
134+
<!-- 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. -->
121135
包含名为 “target[suffix][+patchtype].extension” 的文件的目录的路径。
122136
例如,“kube-apiserver0+merge.yaml” 或只是 “etcd.json”。
123-
“target” 可以是 “kube-apiserver”、“kube-controller-manager”、“kube-scheduler”、“etcd” 之一。
137+
“target” 可以是 “kube-apiserver”、“kube-controller-manager”、“kube-scheduler”、“etcd” 、”kubeletconfiguration”之一。
124138
“patchtype” 可以是 “strategic”、“merge” 或 “json”,它们匹配 kubectl 支持的补丁格式。
125139
默认的 “patchtype” 是 “strategic”。“extension” 必须是 “json” 或 “yaml”。
126140
“suffix” 是一个可选字符串,可用于基于字母数字顺序确定首先应用哪些补丁。

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_kubelet-start.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ kubeadm join phase kubelet-start [api-server-endpoint] [flags]
5050
<tr>
5151
<td></td><td style="line-height: 130%; word-wrap: break-word;">
5252
<!--
53-
Path to kubeadm config file.
53+
Path to a kubeadm configuration file.
5454
-->
5555
kubeadm 配置文件的路径。
5656
</td>
@@ -126,6 +126,20 @@ For token-based discovery, allow joining without --discovery-token-ca-cert-hash
126126
</td>
127127
</tr>
128128

129+
<tr>
130+
<td colspan="2">--dry-run</td>
131+
</tr>
132+
<tr>
133+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
134+
<!--
135+
Don't apply any changes; just output what would be done.
136+
-->
137+
<p>
138+
不做任何更改;只输出将要执行的操作。
139+
</p>
140+
</td>
141+
</tr>
142+
129143
<tr>
130144
<td colspan="2">-h, --help</td>
131145
</tr>

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

Lines changed: 1 addition & 1 deletion
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.

0 commit comments

Comments
 (0)