96d5a7a4dd
This change ports the following kubernetes 1.27.5 patches which were refactored slightly to allow for upstream changes The following patches were applied cleanly: kubeadm-create-platform-pods-with-zero-CPU-resources.patch kubelet-sort-isolcpus-allocation-when-SMT-enabled.patch The following patches were refactored: Revert-use-subpath-for-coredns-only-for-default-repo.patch kubernetes-make-isolcpus-allocation-SMT-aware.patch kubelet-cpumanager-disable-CFS-quota-throttling.patch kubelet-cpumanager-keep-normal-containers-off-reserv.patch kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch enable-support-for-kubernetes-to-ignore-isolcpus.patch kubelet-CFS-quota-throttling-for-non-integer-cpulimit.patch Test Plan: PASS: Kubernetes package 1.27.5 builds properly. PASS: Run all Kubelet, kubeadm, kubectl make tests for affected code. Story: 2010878 Task: 48740 Depends-On: https://review.opendev.org/c/starlingx/integ/+/892988 Change-Id: I130d41d2b906826e5cb8186ec754e0e74a7d891a Signed-off-by: Boovan Rajendran <boovan.rajendran@windriver.com>
31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
From 9ffea908e29ee477b75fe03baa881e83e8e7f429 Mon Sep 17 00:00:00 2001
|
|
From: Boovan Rajendran <boovan.rajendran@windriver.com>
|
|
Date: Mon, 4 Sep 2023 08:05:29 -0400
|
|
Subject: [PATCH] kubelet CFS quota throttling for non integer cpulimit
|
|
|
|
Signed-off-by: Boovan Rajendran <boovan.rajendran@windriver.com>
|
|
---
|
|
pkg/kubelet/cm/internal_container_lifecycle_linux.go | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/pkg/kubelet/cm/internal_container_lifecycle_linux.go b/pkg/kubelet/cm/internal_container_lifecycle_linux.go
|
|
index a99d01f8884..e5e25cd56de 100644
|
|
--- a/pkg/kubelet/cm/internal_container_lifecycle_linux.go
|
|
+++ b/pkg/kubelet/cm/internal_container_lifecycle_linux.go
|
|
@@ -39,7 +39,11 @@ func (i *internalContainerLifecycleImpl) PreCreateContainer(pod *v1.Pod, contain
|
|
// Disable cgroup CFS throttle at the container level.
|
|
// /sys/fs/cgroup/cpu/k8s-infra/kubepods/<pod>/<container>/cpu.cfs_quota_us
|
|
// /sys/fs/cgroup/cpu/k8s-infra/kubepods/<pod>/<container>/cpu.cfs_period_us
|
|
- if i.cpuManager.GetCPUPolicy() == "static" && v1qos.GetPodQOS(pod) == v1.PodQOSGuaranteed {
|
|
+ // We can only set CpuQuota to -1 if we're allocating the entire CPU.
|
|
+ // For fractional CPUs the CpuQuota is needed to enforce the limit.
|
|
+ cpuQuantity := container.Resources.Requests[v1.ResourceCPU]
|
|
+ fractionalCpuQuantity := cpuQuantity.MilliValue()%1000
|
|
+ if i.cpuManager.GetCPUPolicy() == "static" && v1qos.GetPodQOS(pod) == v1.PodQOSGuaranteed && fractionalCpuQuantity == 0 {
|
|
containerConfig.Linux.Resources.CpuPeriod = int64(100000)
|
|
containerConfig.Linux.Resources.CpuQuota = int64(-1)
|
|
}
|
|
--
|
|
2.25.1
|
|
|