Skip to content

Commit b39c2dd

Browse files
authored
Merge pull request #27742 from mengjiao-liu/sync-manage-resources-containers
[zh] Sync content/en/docs/concepts/configuration/manage-resources-containers.md
2 parents 2de4710 + e97efe5 commit b39c2dd

File tree

2 files changed

+810
-14
lines changed

2 files changed

+810
-14
lines changed

content/zh/docs/concepts/configuration/manage-resources-containers.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ This is different from the `memory` and `cpu` resources.
134134
{{< /note >}}
135135

136136
<!--
137-
CPU and memory are collectively referred to as *compute resources*, or just
138-
*resources*. Compute
137+
CPU and memory are collectively referred to as *compute resources*, or *resources*. Compute
139138
resources are measurable quantities that can be requested, allocated, and
140139
consumed. They are distinct from
141140
[API resources](/docs/concepts/overview/kubernetes-api/). API resources, such as Pods and
@@ -810,7 +809,9 @@ If you want to use project quotas, you should:
810809
811810
* Enable the `LocalStorageCapacityIsolationFSQuotaMonitoring=true`
812811
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
813-
in the kubelet configuration.
812+
using the `featureGates` field in the
813+
[kubelet configuration](/docs/reference/config-api/kubelet-config.v1beta1/)
814+
or the `--feature-gates` command line flag.
814815
815816
* Ensure that the root filesystem (or optional runtime filesystem)
816817
has project quotas enabled. All XFS filesystems support project quotas.
@@ -828,8 +829,8 @@ If you want to use project quotas, you should:
828829

829830
如果你希望使用项目配额,你需要:
830831

831-
* 在 kubelet 配置中启用 `LocalStorageCapacityIsolationFSQuotaMonitoring=true`
832-
[特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)
832+
*[kubelet 配置](/zh/docs/reference/config-api/kubelet-config.v1beta1/)中使用 `featureGates` 字段 或者使用 `--feature-gates` 命令行参数
833+
启用 `LocalStorageCapacityIsolationFSQuotaMonitoring=true` [特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)
833834

834835
* 确保根文件系统(或者可选的运行时文件系统)启用了项目配额。所有 XFS
835836
文件系统都支持项目配额。
@@ -952,15 +953,14 @@ Cluster-level extended resources are not tied to nodes. They are usually managed
952953
by scheduler extenders, which handle the resource consumption and resource quota.
953954
954955
You can specify the extended resources that are handled by scheduler extenders
955-
in [scheduler policy
956-
configuration](https://github.com/kubernetes/kubernetes/blob/release-1.10/pkg/scheduler/api/v1/types.go#L31).
956+
in [scheduler policy configuration](/docs/reference/config-api/kube-scheduler-policy-config.v1/)
957957
-->
958958
#### 集群层面的扩展资源 {#cluster-level-extended-resources}
959959

960960
集群层面的扩展资源并不绑定到具体节点。
961961
它们通常由调度器扩展程序(Scheduler Extenders)管理,这些程序处理资源消耗和资源配额。
962962

963-
你可以在[调度器策略配置](https://github.com/kubernetes/kubernetes/blob/release-1.10/pkg/scheduler/api/v1/types.go#L31)
963+
你可以在[调度器策略配置](/zh/docs/reference/config-api/kube-scheduler-policy-config.v1/)
964964
中指定由调度器扩展程序处理的扩展资源。
965965

966966
<!--
@@ -1005,7 +1005,7 @@ extender.
10051005
<!--
10061006
### Consuming extended resources
10071007
1008-
Users can consume extended resources in Pod specs just like CPU and memory.
1008+
Users can consume extended resources in Pod specs like CPU and memory.
10091009
The scheduler takes care of the resource accounting so that no more than the
10101010
available amount is simultaneously allocated to Pods.
10111011
@@ -1281,17 +1281,13 @@ You can see that the Container was terminated because of `reason:OOM Killed`, wh
12811281

12821282
<!--
12831283
* Get hands-on experience [assigning Memory resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-memory-resource/).
1284-
12851284
* Get hands-on experience [assigning CPU resources to Containers and Pods](/docs/tasks/configure-pod-container/assign-cpu-resource/).
1286-
12871285
* For more details about the difference between requests and limits, see
12881286
[Resource QoS](https://git.k8s.io/community/contributors/design-proposals/node/resource-qos.md).
1289-
12901287
* Read the [Container](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#container-v1-core) API reference
1291-
12921288
* Read the [ResourceRequirements](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#resourcerequirements-v1-core) API reference
1293-
12941289
* Read about [project quotas](http://xfs.org/docs/xfsdocs-xml-dev/XFS_User_Guide/tmp/en-US/html/xfs-quotas.html) in XFS
1290+
* Read more about the [kube-scheduler Policy reference (v1)](/docs/reference/config-api/kube-scheduler-policy-config.v1/)
12951291
-->
12961292

12971293
* 获取[分配内存资源给容器和 Pod ](/zh/docs/tasks/configure-pod-container/assign-memory-resource/) 的实践经验
@@ -1300,4 +1296,5 @@ You can see that the Container was terminated because of `reason:OOM Killed`, wh
13001296
* 阅读 API 参考文档中 [Container](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#container-v1-core) 部分。
13011297
* 阅读 API 参考文档中 [ResourceRequirements](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#resourcerequirements-v1-core) 部分。
13021298
* 阅读 XFS 中关于[项目配额](https://xfs.org/docs/xfsdocs-xml-dev/XFS_User_Guide/tmp/en-US/html/xfs-quotas.html) 的文档。
1299+
* 阅读更多关于[kube-scheduler 策略参考 (v1)](/zh/docs/reference/config-api/kube-scheduler-policy-config.v1/) 的文档。
13031300

0 commit comments

Comments
 (0)