starlingx/integ
Code Issues Proposed changes

Merge "Add metrics-server to list of platform namespaces"

Browse Source
This commit is contained in:
Zuul 2022-03-23 15:42:04 +00:00 committed by Gerrit Code Review
commit 89aadafae9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kubernetes/kubernetes-1.23.1/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch → kubernetes/kubernetes-1.23.1/centos/files/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 fd82223092ebbe1c4f598014bbd51391f115115d Mon Sep 17 00:00:00 2001
From: Gleb Aronsky <gleb.aronsky@windriver.com> From: Thiago Miranda <ThiagoOliveira.Miranda@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,14 @@ 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>
--- ---
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 +34,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

2
kubernetes/kubernetes-1.23.1/centos/kubernetes.spec
View File

@ -53,7 +53,7 @@ Source5: kubelet-cgroup-setup.sh
Patch1: kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch Patch1: kubelet-cpumanager-disable-CFS-quota-throttling-for-.patch
Patch2: kubelet-cpumanager-keep-normal-containers-off-reserv.patch Patch2: kubelet-cpumanager-keep-normal-containers-off-reserv.patch
Patch3: kubelet-cpumanager-infrastructure-pods-use-system-re.patch Patch3: kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch
Patch4: kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch Patch4: kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch
Patch5: kubeadm-create-platform-pods-with-zero-CPU-resources.patch Patch5: kubeadm-create-platform-pods-with-zero-CPU-resources.patch
Patch6: enable-support-for-kubernetes-to-ignore-isolcpus.patch Patch6: enable-support-for-kubernetes-to-ignore-isolcpus.patch