starlingx/integ
Code Issues Proposed changes

Debian: Add metrics-server to platform namespaces

Browse Source 
This change https://review.opendev.org/c/starlingx/integ/+/834215
adds metrics-server to the list of platform namespaces for
k8s 1.23.1. Apparently, Debian package for k8s 1.23.1 was not
added when above change was created.

Note: The patch was copied from centos/files.

Test Plan:
Pass: Package builds successfully
PASS: Image built and deployed successfully.
PASS: Apply metrics-server and verify that metrics-server is
      running on platform CPUs.

Closes-Bug: 1964503

Signed-off-by: Kaustubh Dhokte <kaustubh.dhokte@windriver.com>
Change-Id: I989be27416f388dc0ff46a820b8fa3a276600737
This commit is contained in:
Kaustubh Dhokte 2022-07-08 23:20:13 +00:00
parent 5136501e29
commit 500adad67e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kubernetes/kubernetes-1.23.1/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch → kubernetes/kubernetes-1.23.1/debian/deb_folder/patches/kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch
View File

@ -1,15 +1,14 @@
From 2f16a9e2c8dc5995aad9a04636ff4f20cb7b51c7 Mon Sep 17 00:00:00 2001 From c143985b9f9390c59ebdccfdbe160f63008abebb Mon Sep 17 00:00:00 2001
From: Gleb Aronsky <gleb.aronsky@windriver.com> From: Gleb Aronsky <gleb.aronsky@windriver.com>
Date: Tue, 25 Jan 2022 12:35:48 -0500 Date: Mon, 21 Mar 2022 17:25:07 -0300
Subject: [PATCH] kubelet cpumanager infrastructure pods use system reserved Subject: [PATCH] kubelet cpumanager infra pods use system reserved CPUs
CPUs
This assigns system infrastructure pods to the "reserved" cpuset This assigns system infrastructure pods to the "reserved" cpuset
to isolate them from the shared pool of CPUs. to isolate them from the shared pool of CPUs.
Infrastructure pods include any pods that belong to the kube-system, Infrastructure pods include any pods that belong to the kube-system,
armada, cert-manager, vault, platform-deployment-manager, portieris, armada, cert-manager, vault, platform-deployment-manager, portieris,
notification or flux-helm namespaces. notification, flux-helm or metrics-server namespaces.
The implementation is a bit simplistic, it is assumed that the The implementation is a bit simplistic, it is assumed that the
"reserved" cpuset is large enough to handle all infrastructure pods "reserved" cpuset is large enough to handle all infrastructure pods
@ -19,13 +18,15 @@ This also prevents infrastucture pods from using Guaranteed resources.
Co-authored-by: Jim Gauld <james.gauld@windriver.com> Co-authored-by: Jim Gauld <james.gauld@windriver.com>
Signed-off-by: Gleb Aronsky <gleb.aronsky@windriver.com> Signed-off-by: Gleb Aronsky <gleb.aronsky@windriver.com>
Signed-off-by: Thiago Miranda <ThiagoOliveira.Miranda@windriver.com>
Signed-off-by: Kaustubh Dhokte <kaustubh.dhokte@windriver.com>
--- ---
pkg/kubelet/cm/cpumanager/policy_static.go | 47 +++++++++++++++++-- pkg/kubelet/cm/cpumanager/policy_static.go | 47 +++++++++++++++++--
.../cm/cpumanager/policy_static_test.go | 19 +++++++- .../cm/cpumanager/policy_static_test.go | 19 +++++++-
2 files changed, 61 insertions(+), 5 deletions(-) 2 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/pkg/kubelet/cm/cpumanager/policy_static.go b/pkg/kubelet/cm/cpumanager/policy_static.go diff --git a/pkg/kubelet/cm/cpumanager/policy_static.go b/pkg/kubelet/cm/cpumanager/policy_static.go
index 9697f4d4bb0..aeac7fdc8cb 100644 index 9697f4d4bb0..f603daf4c88 100644
--- a/pkg/kubelet/cm/cpumanager/policy_static.go --- a/pkg/kubelet/cm/cpumanager/policy_static.go
+++ b/pkg/kubelet/cm/cpumanager/policy_static.go +++ b/pkg/kubelet/cm/cpumanager/policy_static.go
@@ -53,6 +53,11 @@ func (e SMTAlignmentError) Type() string { @@ -53,6 +53,11 @@ func (e SMTAlignmentError) Type() string {
@ -34,7 +35,7 @@ index 9697f4d4bb0..aeac7fdc8cb 100644
+// Define namespaces used by platform infrastructure pods +// Define namespaces used by platform infrastructure pods
+var infraNamespaces = [...]string{ +var infraNamespaces = [...]string{
+ "kube-system", "armada", "cert-manager", "platform-deployment-manager", "portieris", "vault", "notification", "flux-helm", + "kube-system", "armada", "cert-manager", "platform-deployment-manager", "portieris", "vault", "notification", "flux-helm", "metrics-server",
+} +}
+ +
// staticPolicy is a CPU manager policy that does not change CPU // staticPolicy is a CPU manager policy that does not change CPU
@ -145,5 +146,5 @@ index 80bd04a1f92..34c5a23c553 100644
testExcl := true testExcl := true
-- --
2.25.1 2.30.2

2
kubernetes/kubernetes-1.23.1/debian/deb_folder/patches/series
View File

@ -1,6 +1,6 @@
kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch
kubelet-cpumanager-keep-normal-containers-off-reserv.patch kubelet-cpumanager-keep-normal-containers-off-reserv.patch
kubelet-cpumanager-infrastructure-pods-use-system-re.patch kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch
kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch
kubeadm-create-platform-pods-with-zero-CPU-resources.patch kubeadm-create-platform-pods-with-zero-CPU-resources.patch
enable-support-for-kubernetes-to-ignore-isolcpus.patch enable-support-for-kubernetes-to-ignore-isolcpus.patch