Skip to content

Commit 915cd02

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #22271 from jiazxjason/patch-18
Update zh trans kubeadm_upgrade_diff.md
2 parents 0091626 + 7e126bd commit 915cd02

File tree

1 file changed

+94
-50
lines changed

1 file changed

+94
-50
lines changed

‎content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_diff.md

Lines changed: 94 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,185 @@
11
<!--
2+
3+
24
### Synopsis
35
6+
47
Show what differences would be applied to existing static pod manifests. See also: kubeadm upgrade apply --dry-run
8+
9+
```
10+
kubeadm upgrade diff [version] [flags]
11+
```
512
-->
613
### 概述
714

8-
显示哪些差异将被应用于现有的静态 pod 资源清单。参考: kubeadm upgrade apply --dry-run
15+
16+
显示哪些差异将被应用于现有的静态 pod 资源清单。参考: kubeadm upgrade apply --dry-run
917

1018
```
1119
kubeadm upgrade diff [version] [flags]
1220
```
1321
<!--
22+
1423
### Options
1524
16-
```
25+
<table style="width: 100%; table-layout: fixed;">
26+
<colgroup>
27+
<col span="1" style="width: 10px;" />
28+
<col span="1" />
29+
</colgroup>
30+
<tbody>
31+
1732
<tr>
18-
<td colspan="2">--api-server-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/manifests/kube-apiserver.yaml"</td>
33+
<td colspan="2">--api-server-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/manifests/kube-apiserver.yaml"</td>
1934
</tr>
2035
<tr>
21-
<td></td><td style="line-height: 130%; word-wrap: break-word;">path to API server manifest</td>
36+
<td></td><td style="line-height: 130%; word-wrap: break-word;">path to API server manifest</td>
2237
</tr>
38+
-->
39+
### 选项
40+
41+
<table style="width: 100%; table-layout: fixed;">
42+
<colgroup>
43+
<col span="1" style="width: 10px;" />
44+
<col span="1" />
45+
</colgroup>
46+
<tbody>
2347

2448
<tr>
25-
<td colspan="2">--config string</td>
49+
<td colspan="2">--api-server-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值："/etc/kubernetes/manifests/kube-apiserver.yaml"</td>
2650
</tr>
2751
<tr>
28-
<td></td><td style="line-height: 130%; word-wrap: break-word;">Path to a kubeadm configuration file.</td>
52+
<td></td><td style="line-height: 130%; word-wrap: break-word;">API服务器清单的路径</td>
2953
</tr>
30-
54+
<!--
3155
<tr>
32-
<td colspan="2">-c, --context-lines int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: 3</td>
56+
<td colspan="2">--config string</td>
3357
</tr>
3458
<tr>
35-
<td></td><td style="line-height: 130%; word-wrap: break-word;">How many lines of context in the diff</td>
59+
<td></td><td style="line-height: 130%; word-wrap: break-word;">Path to a kubeadm configuration file.</td>
3660
</tr>
37-
61+
-->
3862
<tr>
39-
<td colspan="2">--controller-manager-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/manifests/kube-controller-manager.yaml"</td>
63+
<td colspan="2">--config string</td>
4064
</tr>
4165
<tr>
42-
<td></td><td style="line-height: 130%; word-wrap: break-word;">path to controller manifest</td>
66+
<td></td><td style="line-height: 130%; word-wrap: break-word;">kubeadm 配置文件的路径</td>
4367
</tr>
44-
68+
<!--
4569
<tr>
46-
<td colspan="2">-h, --help</td>
70+
<td colspan="2">-c, --context-lines int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: 3</td>
4771
</tr>
4872
<tr>
49-
<td></td><td style="line-height: 130%; word-wrap: break-word;">help for diff</td>
73+
<td></td><td style="line-height: 130%; word-wrap: break-word;">How many lines of context in the diff</td>
5074
</tr>
51-
75+
-->
5276
<tr>
53-
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"</td>
77+
<td colspan="2">-c, --context-lines int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值：3</td>
5478
</tr>
5579
<tr>
56-
<td></td><td style="line-height: 130%; word-wrap: break-word;">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.</td>
80+
<td></td><td style="line-height: 130%; word-wrap: break-word;">差异中有多少行上下文</td>
5781
</tr>
58-
82+
<!--
5983
<tr>
60-
<td colspan="2">--scheduler-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/manifests/kube-scheduler.yaml"</td>
84+
<td colspan="2">--controller-manager-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/manifests/kube-controller-manager.yaml"</td>
6185
</tr>
6286
<tr>
63-
<td></td><td style="line-height: 130%; word-wrap: break-word;">path to scheduler manifest</td>
87+
<td></td><td style="line-height: 130%; word-wrap: break-word;">path to controller manifest</td>
6488
</tr>
65-
```
66-
6789
-->
68-
### 选项
69-
7090
<tr>
71-
<td colspan="2">--api-server-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值： "/etc/kubernetes/manifests/kube-apiserver.yaml"</td>
91+
<td colspan="2">--controller-manager-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值： "/etc/kubernetes/manifests/kube-controller-manager.yaml"</td>
7292
</tr>
7393
<tr>
74-
<td></td><td style="line-height: 130%; word-wrap: break-word;">API服务器清单的路径</td>
94+
<td></td><td style="line-height: 130%; word-wrap: break-word;">控制器清单的路径</td>
7595
</tr>
76-
96+
<!--
7797
<tr>
78-
<td colspan="2">--config string</td>
98+
<td colspan="2">-h, --help</td>
7999
</tr>
80100
<tr>
81-
<td></td><td style="line-height: 130%; word-wrap: break-word;"> API 服务器清单的路径。</td>
101+
<td></td><td style="line-height: 130%; word-wrap: break-word;">help for diff</td>
82102
</tr>
83-
103+
-->
84104
<tr>
85-
<td colspan="2">-c, --context-lines int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值： 3</td>
105+
<td colspan="2">-h, --help</td>
86106
</tr>
87107
<tr>
88-
<td></td><td style="line-height: 130%; word-wrap: break-word;">差异中有多少行上下文</td>
108+
<td></td><td style="line-height: 130%; word-wrap: break-word;">帮助</td>
89109
</tr>
90-
110+
<!--
91111
<tr>
92-
<td colspan="2">--controller-manager-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值： "/etc/kubernetes/manifests/kube-controller-manager.yaml"</td>
112+
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"</td>
93113
</tr>
94114
<tr>
95-
<td></td><td style="line-height: 130%; word-wrap: break-word;">控制器清单的路径</td>
115+
<td></td><td style="line-height: 130%; word-wrap: break-word;">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.</td>
96116
</tr>
97-
117+
-->
98118
<tr>
99-
<td colspan="2">-h, --help</td>
119+
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值："/etc/kubernetes/admin.conf"</td>
100120
</tr>
101121
<tr>
102-
<td></td><td style="line-height: 130%; word-wrap: break-word;">帮助</td>
122+
<td></td><td style="line-height: 130%; word-wrap: break-word;">与集群通信时使用的 kubeconfig 文件，如果标志是未设置，则可以在一组标准位置中搜索现有的 kubeconfig 文件。</td>
103123
</tr>
104-
124+
<!--
105125
<tr>
106-
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值： "/etc/kubernetes/admin.conf"</td>
126+
<td colspan="2">--scheduler-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/manifests/kube-scheduler.yaml"</td>
107127
</tr>
108128
<tr>
109-
<td></td><td style="line-height: 130%; word-wrap: break-word;">与集群通信时使用的 kubeconfig 文件，如果标志是未设置，则可以在一组标准位置中搜索现有的 kubeconfig 文件。</td>
129+
<td></td><td style="line-height: 130%; word-wrap: break-word;">path to scheduler manifest</td>
110130
</tr>
111131
132+
</tbody>
133+
</table>
134+
-->
112135
<tr>
113-
<td colspan="2">--scheduler-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值："/etc/kubernetes/manifests/kube-scheduler.yaml"</td>
136+
<td colspan="2">--scheduler-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值："/etc/kubernetes/manifests/kube-scheduler.yaml"</td>
114137
</tr>
115138
<tr>
116-
<td></td><td style="line-height: 130%; word-wrap: break-word;">调度程序清单的路径</td>
139+
<td></td><td style="line-height: 130%; word-wrap: break-word;">调度程序清单的路径</td>
117140
</tr>
118141

142+
</tbody>
143+
</table>
144+
119145
<!--
120146
### Options inherited from parent commands
121147
122-
```
148+
<table style="width: 100%; table-layout: fixed;">
149+
<colgroup>
150+
<col span="1" style="width: 10px;" />
151+
<col span="1" />
152+
</colgroup>
153+
<tbody>
154+
123155
<tr>
124-
<td colspan="2">--rootfs string</td>
156+
<td colspan="2">--rootfs string</td>
125157
</tr>
126158
<tr>
127-
<td></td><td style="line-height: 130%; word-wrap: break-word;">[EXPERIMENTAL] The path to the 'real' host root filesystem.</td>
159+
<td></td><td style="line-height: 130%; word-wrap: break-word;">[EXPERIMENTAL] The path to the 'real' host root filesystem.</td>
128160
</tr>
129-
```
161+
162+
</tbody>
163+
</table>
130164
131165
-->
166+
132167
### 从父命令继承的选项
133168

169+
<table style="width: 100%; table-layout: fixed;">
170+
<colgroup>
171+
<col span="1" style="width: 10px;" />
172+
<col span="1" />
173+
</colgroup>
174+
<tbody>
134175

135176
<tr>
136-
<td colspan="2">--rootfs string</td>
177+
<td colspan="2">--rootfs string</td>
137178
</tr>
138179
<tr>
139-
<td></td><td style="line-height: 130%; word-wrap: break-word;">[EXPERIMENTAL] “真实”主机根文件系统的路径。</td>
180+
<td></td><td style="line-height: 130%; word-wrap: break-word;">[EXPERIMENTAL] “真实”主机根文件系统的路径。</td>
140181
</tr>
141182

183+
</tbody>
184+
</table>
185+

0 commit comments

Comments
 (0)