Skip to content

Commit 0468384

Browse files
authored
Merge pull request #25057 from tengqm/zh-sync-6
[zh] Sync changes from English site (6)
2 parents cea3965 + 86ca2a9 commit 0468384

File tree

9 files changed

+608
-347
lines changed

9 files changed

+608
-347
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
2-
title: "控制器"
2+
title: "工作负载资源"
33
weight: 20
44
---

content/zh/docs/concepts/workloads/controllers/deployment.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,20 +201,20 @@ Follow the steps given below to create the above Deployment:
201201
3. 要查看 Deployment 上线状态,运行 `kubectl rollout status deployment.v1.apps/nginx-deployment`
202202
输出类似于:
203203

204-
```
205-
Waiting for rollout to finish: 2 out of 3 new replicas have been updated...
206-
deployment "nginx-deployment" successfully rolled out
207-
```
204+
```
205+
Waiting for rollout to finish: 2 out of 3 new replicas have been updated...
206+
deployment "nginx-deployment" successfully rolled out
207+
```
208208

209209
<!--
210210
4. Run the `kubectl get deployments` again a few seconds later. The output is similar to this:
211211
-->
212212
4. 几秒钟后再次运行 `kubectl get deployments`。输出类似于:
213213

214-
```
215-
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
216-
nginx-deployment 3 3 3 3 18s
217-
```
214+
```
215+
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
216+
nginx-deployment 3 3 3 3 18s
217+
```
218218

219219
<!--
220220
Notice that the Deployment has created all three replicas, and all replicas are up-to-date (they contain the latest Pod template) and available.
@@ -1504,7 +1504,7 @@ deployment.apps/nginx-deployment patched
15041504
Once the deadline has been exceeded, the Deployment controller adds a DeploymentCondition with the following
15051505
attributes to the Deployment's `.status.conditions`:
15061506
-->
1507-
超过截止时间后, Deployment 控制器将添加具有以下属性的 DeploymentCondition 到
1507+
超过截止时间后,Deployment 控制器将添加具有以下属性的 DeploymentCondition 到
15081508
Deployment 的 `.status.conditions` 中:
15091509

15101510
* Type=Progressing
@@ -1514,7 +1514,9 @@ Deployment 的 `.status.conditions` 中:
15141514
<!--
15151515
See the [Kubernetes API conventions](https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties) for more information on status conditions.
15161516
-->
1517-
参考 [Kubernetes API 约定](https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties) 获取更多状态状况相关的信息。
1517+
参考
1518+
[Kubernetes API 约定](https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties)
1519+
获取更多状态状况相关的信息。
15181520

15191521
<!--
15201522
Kubernetes takes no action on a stalled Deployment other than to report a status condition with

content/zh/docs/concepts/workloads/controllers/garbage-collection.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: 垃圾收集
33
content_type: concept
4-
weight: 70
4+
weight: 60
55
---
66

77
<!--
88
title: Garbage Collection
99
content_type: concept
10-
weight: 70
10+
weight: 60
1111
-->
1212

1313
<!-- overview -->

content/zh/docs/concepts/workloads/controllers/job.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ feature:
55
title: 批量执行
66
description: >
77
除了服务之外,Kubernetes 还可以管理你的批处理和 CI 工作负载,在期望时替换掉失效的容器。
8-
weight: 60
8+
weight: 50
99
---
1010
<!--
1111
reviewers:
@@ -17,7 +17,7 @@ feature:
1717
title: Batch execution
1818
description: >
1919
In addition to services, Kubernetes can manage your batch and CI workloads, replacing containers that fail, if desired.
20-
weight: 60
20+
weight: 50
2121
-->
2222

2323
<!-- overview -->

0 commit comments

Comments
 (0)