Skip to content

Commit 9536c4b

Browse files
authored
Merge pull request #38754 from Zhuzhenghao/feature/sync
[zh-cn] Sync files with en
2 parents 4e6ecef + 2019818 commit 9536c4b

File tree

5 files changed

+36
-33
lines changed

5 files changed

+36
-33
lines changed

content/zh-cn/docs/tasks/manage-daemon/rollback-daemon-set.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ REVISION CHANGE-CAUSE
6767

6868
<!--
6969
* Change cause is copied from DaemonSet annotation `kubernetes.io/change-cause`
70-
to its revisions upon creation. You may specify `-record=true` in `kubectl`
70+
to its revisions upon creation. You may specify `--record=true` in `kubectl`
7171
to record the command executed in the change cause annotation.
7272
7373
To see the details of a specific revision:
@@ -93,11 +93,11 @@ Pod Template:
9393
Labels: foo=bar
9494
Containers:
9595
app:
96-
Image: ...
97-
Port: ...
98-
Environment: ...
99-
Mounts: ...
100-
Volumes: ...
96+
Image: ...
97+
Port: ...
98+
Environment: ...
99+
Mounts: ...
100+
Volumes: ...
101101
```
102102

103103
<!--

content/zh-cn/docs/tasks/manage-kubernetes-objects/imperative-config.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ configuration file.
108108

109109
* `kubectl delete -f <filename|url>`
110110

111-
<!-- note
111+
<!--
112112
If configuration file has specified the `generateName` field in the `metadata`
113113
section instead of the `name` field, you cannot delete the object using
114114
`kubectl delete -f <filename|url>`.
@@ -252,7 +252,9 @@ used only by the controller selector with no other semantic meaning.
252252
-->
253253
推荐的方法是定义单个不变的 PodTemplate 标签,该标签仅由控制器选择器使用,而没有其他语义。
254254

255-
<!-- Example label: -->
255+
<!--
256+
Example label:
257+
-->
256258
标签示例:
257259

258260
```yaml
@@ -270,7 +272,7 @@ template:
270272
<!--
271273
* [Managing Kubernetes Objects Using Imperative Commands](/docs/tasks/manage-kubernetes-objects/imperative-command/)
272274
* [Declarative Management of Kubernetes Objects Using Configuration Files](/docs/tasks/manage-kubernetes-objects/declarative-config/)
273-
* [Kubectl Command Reference](/docs/reference/generated/kubectl/kubectl/)
275+
* [Kubectl Command Reference](/docs/reference/generated/kubectl/kubectl-commands/)
274276
* [Kubernetes API Reference](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/)
275277
-->
276278
* [使用命令式命令管理 Kubernetes 对象](/zh-cn/docs/tasks/manage-kubernetes-objects/imperative-command/)

content/zh-cn/docs/tasks/manage-kubernetes-objects/kustomization.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ kubectl kustomize <kustomization_directory>
3232
```
3333

3434
<!--
35-
To apply those Resources, run `kubectl apply` with `- -kustomize` or `-k` flag:
35+
To apply those Resources, run `kubectl apply` with `--kustomize` or `-k` flag:
3636
-->
3737
要应用这些资源,使用 `--kustomize``-k` 参数来执行 `kubectl apply`
3838

@@ -130,8 +130,7 @@ metadata:
130130
```
131131
132132
<!--
133-
To generate a ConfigMap from an env file, add an entry to the `envs` list in `configMapGenerator`.
134-
Here is an example of generating a ConfigMap with a data item from a `.env` file:
133+
To generate a ConfigMap from an env file, add an entry to the `envs` list in `configMapGenerator`. Here is an example of generating a ConfigMap with a data item from a `.env` file:
135134
-->
136135
要从 env 文件生成 ConfigMap,请在 `configMapGenerator` 中的 `envs` 列表中添加一个条目。
137136
下面是一个用来自 `.env` 文件的数据生成 ConfigMap 的例子:
@@ -1166,9 +1165,7 @@ Run the following command to apply the Deployment object `dev-my-nginx`:
11661165
执行下面的命令来应用 Deployment 对象 `dev-my-nginx`:
11671166

11681167
```shell
1169-
kubectl apply -k ./
1170-
```
1171-
```
1168+
> kubectl apply -k ./
11721169
deployment.apps/dev-my-nginx created
11731170
```
11741171

@@ -1200,9 +1197,7 @@ Run the following command to delete the Deployment object `dev-my-nginx`:
12001197
执行下面的命令删除 Deployment 对象 `dev-my-nginx`:
12011198

12021199
```shell
1203-
kubectl delete -k ./
1204-
```
1205-
```
1200+
> kubectl delete -k ./
12061201
deployment.apps "dev-my-nginx" deleted
12071202
```
12081203

content/zh-cn/docs/tasks/network/customize-hosts-file-for-pods.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ min-kubernetes-server-version: 1.7
1818
<!-- overview -->
1919

2020
<!--
21-
Adding entries to a Pod's /etc/hosts file provides Pod-level override of hostname resolution when DNS and other options are not applicable. You can add these custom entries with the HostAliases field in PodSpec.
21+
Adding entries to a Pod's `/etc/hosts` file provides Pod-level override of hostname resolution when DNS and other options are not applicable. You can add these custom entries with the HostAliases field in PodSpec.
2222
23-
Modification not using HostAliases is not suggested because the file is managed by Kubelet and can be overwritten on during Pod creation/restart.
23+
Modification not using HostAliases is not suggested because the file is managed by the kubelet and can be overwritten on during Pod creation/restart.
2424
-->
2525
当 DNS 配置以及其它选项不合理的时候,通过向 Pod 的 `/etc/hosts` 文件中添加条目,
2626
可以在 Pod 级别覆盖对主机名的解析。你可以通过 PodSpec 的 HostAliases
@@ -32,7 +32,7 @@ Modification not using HostAliases is not suggested because the file is managed
3232
<!-- steps -->
3333

3434
<!--
35-
## Default Hosts File Content
35+
## Default hosts file content
3636
3737
Start an Nginx Pod which is assigned a Pod IP:
3838
-->
@@ -89,19 +89,19 @@ By default, the `hosts` file only includes IPv4 and IPv6 boilerplates like
8989
默认情况下,`hosts` 文件只包含 IPv4 和 IPv6 的样板内容,像 `localhost` 和主机名称。
9090

9191
<!--
92-
## Adding Additional Entries with HostAliases
92+
## Adding additional entries with hostAliases
9393
94-
In addition to the default boilerplate, we can add additional entries to the
94+
In addition to the default boilerplate, you can add additional entries to the
9595
`hosts` file.
9696
For example: to resolve `foo.local`, `bar.local` to `127.0.0.1` and `foo.remote`,
97-
`bar.remote` to `10.1.2.3`, we can configure HostAliases for a Pod under
97+
`bar.remote` to `10.1.2.3`, you can configure HostAliases for a Pod under
9898
`.spec.hostAliases`:
9999
-->
100100
## 通过 HostAliases 增加额外条目
101101

102-
除了默认的样板内容,我们可以向 `hosts` 文件添加额外的条目。
102+
除了默认的样板内容,你可以向 `hosts` 文件添加额外的条目。
103103
例如,要将 `foo.local``bar.local` 解析为 `127.0.0.1`
104-
`foo.remote``bar.remote` 解析为 `10.1.2.3`我们可以在
104+
`foo.remote``bar.remote` 解析为 `10.1.2.3`你可以在
105105
`.spec.hostAliases` 下为 Pod 配置 HostAliases。
106106

107107
{{< codenew file="service/networking/hostaliases-pod.yaml" >}}
@@ -158,7 +158,7 @@ fe00::2 ip6-allrouters
158158
```
159159

160160
<!--
161-
With the additional entries specified at the bottom.
161+
with the additional entries specified at the bottom.
162162
-->
163163
在最下面额外添加了一些条目。
164164

content/zh-cn/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ reviewers:
1414
title: Horizontal Pod Autoscaler Walkthrough
1515
content_type: task
1616
weight: 100
17+
min-kubernetes-server-version: 1.23
1718
-->
1819

1920
<!-- overview -->
@@ -61,8 +62,7 @@ HorizontalPodAutoscaler 会指示工作负载资源(Deployment、StatefulSet
6162
{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
6263

6364
<!--
64-
If you're running an older
65-
release of Kubernetes, refer to the version of the documentation for that release (see
65+
If you're running an older release of Kubernetes, refer to the version of the documentation for that release (see
6666
[available documentation versions](/docs/home/supported-doc-versions/)).
6767
-->
6868
如果你运行的是旧版本的 Kubernetes,请参阅该版本的文档版本
@@ -159,7 +159,9 @@ Deployment 然后更新 ReplicaSet —— 这是所有 Deployment 在 Kubernetes
159159
请参阅[算法详细信息](/zh-cn/docs/tasks/run-application/horizontal-pod-autoscale/#algorithm-details)
160160

161161

162-
<!-- Create the HorizontalPodAutoscaler: -->
162+
<!--
163+
Create the HorizontalPodAutoscaler:
164+
-->
163165
创建 HorizontalPodAutoscaler:
164166

165167
```shell
@@ -181,7 +183,9 @@ You can check the current status of the newly-made HorizontalPodAutoscaler, by r
181183
kubectl get hpa
182184
```
183185

184-
<!-- The output is similar to: -->
186+
<!--
187+
The output is similar to:
188+
-->
185189
输出类似于:
186190

187191
```
@@ -258,7 +262,7 @@ php-apache Deployment/php-apache/scale 305% / 50% 1 10 7
258262

259263
<!--
260264
Here, CPU consumption has increased to 305% of the request.
261-
As a result, the deployment was resized to 7 replicas:
265+
As a result, the Deployment was resized to 7 replicas:
262266
-->
263267
这时,由于请求增多,CPU 利用率已经升至请求值的 305%。
264268
可以看到,Deployment 的副本数量已经增长到了 7:
@@ -319,7 +323,9 @@ NAME REFERENCE TARGET MINPODS MAXPODS REPL
319323
php-apache Deployment/php-apache/scale 0% / 50% 1 10 1 11m
320324
```
321325

322-
<!-- and the Deployment also shows that it has scaled down: -->
326+
<!--
327+
and the Deployment also shows that it has scaled down:
328+
-->
323329
Deployment 也显示它已经缩小了:
324330

325331
```shell

0 commit comments

Comments
 (0)