From 723b94de5048dae19dde84d63cd0253c55308a8d Mon Sep 17 00:00:00 2001 From: Wesley Williams Date: Fri, 16 Jul 2021 18:10:38 +0100 Subject: [PATCH 1/2] Clarify that burstable pods also have their limit enforced by CFS quota --- .../docs/tasks/administer-cluster/cpu-management-policies.md | 3 ++- .../docs/tasks/administer-cluster/cpu-management-policies.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/content/en/docs/tasks/administer-cluster/cpu-management-policies.md b/content/en/docs/tasks/administer-cluster/cpu-management-policies.md index 5ffc40781a..a330668bb2 100644 --- a/content/en/docs/tasks/administer-cluster/cpu-management-policies.md +++ b/content/en/docs/tasks/administer-cluster/cpu-management-policies.md @@ -63,7 +63,8 @@ duration as `--node-status-update-frequency`. The `none` policy explicitly enables the existing default CPU affinity scheme, providing no affinity beyond what the OS scheduler does automatically.  Limits on CPU usage for -[Guaranteed pods](/docs/tasks/configure-pod-container/quality-service-pod/) +[Guaranteed pods](/docs/tasks/configure-pod-container/quality-service-pod/) and +[Burstable pods](/docs/tasks/configure-pod-container/quality-service-pod/) are enforced using CFS quota. ### Static policy diff --git a/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md b/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md index a264ee538a..67c8298222 100644 --- a/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md +++ b/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md @@ -94,7 +94,8 @@ CPU 管理器定期通过 CRI 写入资源更新，以保证内存中 CPU 分配 The `none` policy explicitly enables the existing default CPU affinity scheme, providing no affinity beyond what the OS scheduler does automatically.  Limits on CPU usage for -[Guaranteed pods](/docs/tasks/configure-pod-container/quality-service-pod/) +[Guaranteed pods](/docs/tasks/configure-pod-container/quality-service-pod/) and +[Burstable pods](/docs/tasks/configure-pod-container/quality-service-pod/) are enforced using CFS quota. --> ### none 策略 From 41aa2ba72772b9445459dbd56172070ce1efa9df Mon Sep 17 00:00:00 2001 From: Wesley Williams Date: Thu, 12 Aug 2021 22:48:50 +0100 Subject: [PATCH 2/2] Revert chinese changes --- .../docs/tasks/administer-cluster/cpu-management-policies.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md b/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md index 67c8298222..a264ee538a 100644 --- a/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md +++ b/content/zh/docs/tasks/administer-cluster/cpu-management-policies.md @@ -94,8 +94,7 @@ CPU 管理器定期通过 CRI 写入资源更新，以保证内存中 CPU 分配 The `none` policy explicitly enables the existing default CPU affinity scheme, providing no affinity beyond what the OS scheduler does automatically.  Limits on CPU usage for -[Guaranteed pods](/docs/tasks/configure-pod-container/quality-service-pod/) and -[Burstable pods](/docs/tasks/configure-pod-container/quality-service-pod/) +[Guaranteed pods](/docs/tasks/configure-pod-container/quality-service-pod/) are enforced using CFS quota. --> ### none 策略