Skip to content

Commit e747e5d

Browse files
authored
Merge pull request #53500 from asa3311/sync-zh-204
[zh] sync dynamic-resource-allocation pod-qos
2 parents e9b6f9e + 93f18f1 commit e747e5d

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

content/zh-cn/docs/concepts/scheduling-eviction/dynamic-resource-allocation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ spec:
974974
In addition, users can use a special extended resource to allocate devices without
975975
having to explicitly create a ResourceClaim. Using the extended resource name
976976
prefix `deviceclass.resource.kubernetes.io/` and the DeviceClass name. This works
977-
for any DeviceClass, even if it does not specify the an extended resource name.
977+
for any DeviceClass, even if it does not specify an extended resource name.
978978
The resulting ResourceClaim will contain a request for an `ExactCount` of the
979979
specified number of devices of that DeviceClass.
980980

content/zh-cn/docs/concepts/workloads/pods/pod-qos.md

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ to face eviction. They are guaranteed not to be killed until they exceed their l
6666
or there are no lower-priority Pods that can be preempted from the Node. They may
6767
not acquire resources beyond their specified limits. These Pods can also make
6868
use of exclusive CPUs using the
69-
[`static`](/docs/tasks/administer-cluster/cpu-management-policies/#static-policy) CPU management policy.
69+
[`static`](/docs/tasks/administer-cluster/cpu-management-policies/#static-policy-configuration) CPU management policy.
7070
-->
7171
`Guaranteed` Pod 具有最严格的资源限制,并且最不可能面临驱逐。
7272
在这些 Pod 超过其自身的限制或者没有可以从 Node 抢占的低优先级 Pod 之前,
7373
这些 Pod 保证不会被杀死。这些 Pod 不可以获得超出其指定 limit 的资源。这些 Pod 也可以使用
74-
[`static`](/zh-cn/docs/tasks/administer-cluster/cpu-management-policies/#static-policy)
74+
[`static`](/zh-cn/docs/tasks/administer-cluster/cpu-management-policies/#static-policy-configuration)
7575
CPU 管理策略来使用独占的 CPU。
7676

7777
<!--
@@ -94,6 +94,21 @@ Pod 被赋予 `Guaranteed` QoS 类的几个判据:
9494
* Pod 中的每个容器必须有 CPU limit 和 CPU request。
9595
* 对于 Pod 中的每个容器,CPU limit 必须等于 CPU request。
9696

97+
<!--
98+
If instead the Pod uses [Pod-level resources](/docs/concepts/configuration/manage-resources-containers/#pod-level-resource-specification):
99+
100+
{{< feature-state feature_gate_name="PodLevelResources" >}}
101+
102+
* The Pod must have a Pod-level memory limit and memory request, and their values must be equal.
103+
* The Pod must have a Pod-level CPU limit and CPU request, and their values must be equal.
104+
-->
105+
如果 Pod 使用的是 [Pod 级别资源](/zh-cn/docs/concepts/configuration/manage-resources-containers/#pod-level-resource-specification)
106+
107+
{{< feature-state feature_gate_name="PodLevelResources" >}}
108+
109+
* Pod 必须设置 Pod 级别的内存 limit 和内存 request,并且这两个值必须相等。
110+
* Pod 必须设置 Pod 级别的 CPU limit 和 CPU request,并且这两个值必须相等。
111+
97112
### Burstable
98113

99114
<!--
@@ -117,14 +132,15 @@ that is `Burstable` can try to use any amount of node resources.
117132
A Pod is given a QoS class of `Burstable` if:
118133
119134
* The Pod does not meet the criteria for QoS class `Guaranteed`.
120-
* At least one Container in the Pod has a memory or CPU request or limit.
135+
* At least one Container in the Pod has a memory or CPU request or limit,
136+
or the Pod has a Pod-level memory or CPU request or limit.
121137
-->
122138
#### 判据 {#criteria-1}
123139

124140
Pod 被赋予 `Burstable` QoS 类的几个判据:
125141

126142
* Pod 不满足针对 QoS 类 `Guaranteed` 的判据。
127-
* Pod 中至少一个容器有内存或 CPU 的 request 或 limit。
143+
* Pod 中至少一个容器有内存或 CPU 的 request 或 limit,或者 Pod 本身设置了 Pod 级别的内存或 CPU 的 request 或 limit
128144

129145
### BestEffort
130146

@@ -148,15 +164,16 @@ The kubelet prefers to evict `BestEffort` Pods if the node comes under resource
148164
A Pod has a QoS class of `BestEffort` if it doesn't meet the criteria for either `Guaranteed`
149165
or `Burstable`. In other words, a Pod is `BestEffort` only if none of the Containers in the Pod have a
150166
memory limit or a memory request, and none of the Containers in the Pod have a
151-
CPU limit or a CPU request.
167+
CPU limit or a CPU request,and the Pod does not have any Pod-level memory or CPU limits or requests.
152168
Containers in a Pod can request other resources (not CPU or memory) and still be classified as
153169
`BestEffort`.
154170
-->
155171
#### 判据 {#criteria-2}
156172

157173
如果 Pod 不满足 `Guaranteed``Burstable` 的判据,则它的 QoS 类为 `BestEffort`
158174
换言之,只有当 Pod 中的所有容器没有内存 limit 或内存 request,也没有 CPU limit 或
159-
CPU request 时,Pod 才是 `BestEffort`。Pod 中的容器可以请求(除 CPU 或内存之外的)
175+
CPU request,且 Pod 本身 也没有设置任何 Pod 级别的内存或 CPU 的 limit 或 request 时,
176+
Pod 才是 `BestEffort`。Pod 中的容器可以请求(除 CPU 或内存之外的)
160177
其他资源并且仍然被归类为 `BestEffort`
161178

162179
<!--

0 commit comments

Comments
 (0)