Skip to content

Commit 01a60ed

Browse files
authored
Merge pull request #39029 from Zhuzhenghao/cpu-constraint-namespace
[zh-cn] Sync cpu-constraint-namespace.md
2 parents cc968f4 + 1759231 commit 01a60ed

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

content/zh-cn/docs/tasks/administer-cluster/manage-resources/cpu-constraint-namespace.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,12 @@ kubectl delete pod constraints-cpu-demo --namespace=constraints-cpu-example
211211
<!--
212212
## Attempt to create a Pod that exceeds the maximum CPU constraint
213213

214-
Here's the configuration file for a Pod that has one Container. The Container specifies a
214+
Here's a manifest for a Pod that has one container. The container specifies a
215215
CPU request of 500 millicpu and a cpu limit of 1.5 cpu.
216216
-->
217217
## 尝试创建一个超过最大 CPU 限制的 Pod
218218

219-
这里给出了包含一个容器的 Pod 的配置文件。容器声明了 500 millicpu 的 CPU
219+
这里给出了包含一个容器的 Pod 清单。容器声明了 500 millicpu 的 CPU
220220
请求和 1.5 CPU 的 CPU 限制。
221221

222222
{{< codenew file="admin/resource/cpu-constraints-pod-2.yaml" >}}
@@ -273,7 +273,7 @@ enforced minimum:
273273

274274
```
275275
Error from server (Forbidden): error when creating "examples/admin/resource/cpu-constraints-pod-3.yaml":
276-
pods "constraints-cpu-demo-4" is forbidden: minimum cpu usage per Container is 200m, but request is 100m.
276+
pods "constraints-cpu-demo-3" is forbidden: minimum cpu usage per Container is 200m, but request is 100m.
277277
```
278278

279279
<!--
@@ -408,24 +408,24 @@ kubectl delete namespace constraints-cpu-example
408408
<!--
409409
### For cluster administrators
410410
411-
* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/memory-default-namespace/)
411+
* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/)
412412
413-
* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/cpu-default-namespace/)
413+
* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/manage-resources/cpu-default-namespace/)
414414
415-
* [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/memory-constraint-namespace/)
415+
* [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/manage-resources/memory-constraint-namespace/)
416416
417-
* [Configure Memory and CPU Quotas for a Namespace](/docs/tasks/administer-cluster/quota-memory-cpu-namespace/)
417+
* [Configure Memory and CPU Quotas for a Namespace](/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/)
418418
419-
* [Configure a Pod Quota for a Namespace](/docs/tasks/administer-cluster/quota-pod-namespace/)
419+
* [Configure a Pod Quota for a Namespace](/docs/tasks/administer-cluster/manage-resources/quota-pod-namespace/)
420420
421421
* [Configure Quotas for API Objects](/docs/tasks/administer-cluster/quota-api-object/)
422422
-->
423423

424424
### 集群管理员参考:
425425

426426
* [为命名空间配置默认内存请求和限制](/zh-cn/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/)
427+
* [为命名空间配置默认 CPU 请求和限制](/zh-cn/docs/tasks/administer-cluster/manage-resources/cpu-default-namespace/)
427428
* [为命名空间配置内存限制的最小值和最大值](/zh-cn/docs/tasks/administer-cluster/manage-resources/memory-constraint-namespace/)
428-
* [为命名空间配置 CPU 限制的最小值和最大值](/zh-cn/docs/tasks/administer-cluster/manage-resources/cpu-constraint-namespace/)
429429
* [为命名空间配置内存和 CPU 配额](/zh-cn/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/)
430430
* [为命名空间配置 Pod 配额](/zh-cn/docs/tasks/administer-cluster/manage-resources/quota-pod-namespace/)
431431
* [为 API 对象配置配额](/zh-cn/docs/tasks/administer-cluster/quota-api-object/)

0 commit comments

Comments
 (0)