bc28897dc5
This change ports the following kubernetes 1.28.4 patches which were
refactored slightly to allow for upstream changes
The following patches were applied cleanly:
kubelet-sort-isolcpus-allocation-when-SMT-enabled.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
Affinity-of-guaranteed-pod-to-non-isolated-CPUs.patch
kubelet-CFS-quota-throttling-for-non-integer-cpulimit.patch
The following patches were refactored:
kubeadm-create-platform-pods-with-zero-CPU-resources.patch
kubernetes-make-isolcpus-allocation-SMT-aware.patch
kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch
enable-support-for-kubernetes-to-ignore-isolcpus.patch
Note: Revert-use-subpath-for-coredns-only-for-default-repo.patch
is removed as this change that updates the dns
imageRepository is taken care in ansible playbook
https://review.opendev.org/c/starlingx/ansible-playbooks/+/903499/1/playbookconfig/src/playbooks/roles/common/files/kubeadm.yaml.j2
Test Plan:
PASS: Kubernetes package 1.28.4 builds properly.
PASS: Run all Kubelet, kubeadm, kubectl make tests for affected code.
PASS: build-iso successful with multiple kubernetes versions
PASS: Install iso with k8s 1.28 default and test all patches.
Story: 2010878
Task: 49209
Change-Id: I7693ad2fcc93d146eeae882d44f83b60589565db
Signed-off-by: Saba Touheed Mujawar <sabatouheed.mujawar@windriver.com>
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From a145d85ad716f7dc654727a3d0b2f998686bd273 Mon Sep 17 00:00:00 2001
|
|
From: Jim Gauld <James.Gauld@windriver.com>
|
|
Date: Fri, 11 Feb 2022 11:06:35 -0500
|
|
Subject: [PATCH] kubelet: sort isolcpus allocation when SMT enabled
|
|
|
|
The existing device manager code returns CPUs as devices in unsorted
|
|
order. This numerically sorts isolcpus allocations when SMT/HT is
|
|
enabled on the host. This logs SMT pairs, singletons, and algorithm
|
|
order details to make the algorithm understandable.
|
|
|
|
Signed-off-by: Jim Gauld <James.Gauld@windriver.com>
|
|
---
|
|
pkg/kubelet/cm/devicemanager/manager.go | 13 ++++++++++++-
|
|
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/pkg/kubelet/cm/devicemanager/manager.go b/pkg/kubelet/cm/devicemanager/manager.go
|
|
index 5d0c16ee51e..2447aa88114 100644
|
|
--- a/pkg/kubelet/cm/devicemanager/manager.go
|
|
+++ b/pkg/kubelet/cm/devicemanager/manager.go
|
|
@@ -561,7 +561,16 @@ func order_devices_by_sibling(devices sets.String, needed int) ([]string, error)
|
|
return cpu_lst[0]
|
|
}
|
|
}
|
|
+ //Make post-analysis of selection algorithm obvious by numerical sorting
|
|
+ //the available isolated cpu_id.
|
|
+ cpu_ids := make([]int, 0, int(devices.Len()))
|
|
for cpu_id := range devices {
|
|
+ cpu_id_, _ := strconv.Atoi(cpu_id)
|
|
+ cpu_ids = append(cpu_ids, cpu_id_)
|
|
+ }
|
|
+ sort.Ints(cpu_ids)
|
|
+ for _, _cpu_id := range cpu_ids {
|
|
+ cpu_id := strconv.Itoa(_cpu_id)
|
|
// If we've already found cpu_id as a sibling, skip it.
|
|
if _, ok := _iterated_cpu[cpu_id]; ok {
|
|
continue
|
|
@@ -603,7 +612,9 @@ func order_devices_by_sibling(devices sets.String, needed int) ([]string, error)
|
|
}
|
|
}
|
|
}
|
|
- //klog.Infof("needed=%d ordered_cpu_list=%v", needed, dev_lst)
|
|
+ //This algorithm will get some attention. Show minimal details.
|
|
+ klog.Infof("order_devices_by_sibling: needed=%d, smtpairs=%v, singletons=%v, order=%v",
|
|
+ needed, sibling_lst, single_lst, dev_lst)
|
|
return dev_lst, nil
|
|
}
|
|
func smt_enabled() bool {
|
|
--
|
|
2.25.1
|
|
|