From 636e5352d9445080fce66de14673e90804f4e6e1 Mon Sep 17 00:00:00 2001 From: Thiago Miranda Date: Thu, 10 Mar 2022 12:04:30 -0500 Subject: [PATCH] Add metrics-server to list of platform namespaces Testing: * Deployed ISO with changes. * Configured kube-cpu-mgr-policy=static. * Verified that metrics-server were running on platform CPUs. Partial-Bug: 1964503 Signed-off-by: Thiago Miranda Change-Id: I9bebe9ec27fcd70e89a4cae52bfacde993f958eb --- ...kubelet-cpumanager-infrastructure-pods-use-system-re.patch | 4 ++-- ...kubelet-cpumanager-infrastructure-pods-use-system-re.patch | 4 ++-- ...kubelet-cpumanager-infrastructure-pods-use-system-re.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch b/kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch index 7d9e05217..c982eac1f 100644 --- a/kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch +++ b/kubernetes/kubernetes-1.21.8/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch @@ -9,7 +9,7 @@ to isolate them from the shared pool of CPUs. Infrastructure pods include any pods that belong to the kube-system, 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 "reserved" cpuset is large enough to handle all infrastructure pods @@ -33,7 +33,7 @@ index 94d81796132..b48a5b997a3 100644 +// Define namespaces used by platform infrastructure pods +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 diff --git a/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch index 7d9e05217..c982eac1f 100644 --- a/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch +++ b/kubernetes/kubernetes-1.21.8/debian/deb_folder/patches/kubelet-cpumanager-infrastructure-pods-use-system-re.patch @@ -9,7 +9,7 @@ to isolate them from the shared pool of CPUs. Infrastructure pods include any pods that belong to the kube-system, 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 "reserved" cpuset is large enough to handle all infrastructure pods @@ -33,7 +33,7 @@ index 94d81796132..b48a5b997a3 100644 +// Define namespaces used by platform infrastructure pods +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 diff --git a/kubernetes/kubernetes-1.22.5/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch b/kubernetes/kubernetes-1.22.5/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch index 4e8285771..6f06c12c6 100644 --- a/kubernetes/kubernetes-1.22.5/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch +++ b/kubernetes/kubernetes-1.22.5/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch @@ -9,7 +9,7 @@ to isolate them from the shared pool of CPUs. Infrastructure pods include any pods that belong to the kube-system, 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 "reserved" cpuset is large enough to handle all infrastructure pods @@ -33,7 +33,7 @@ index 89625fc6..492457b1 100644 +// Define namespaces used by platform infrastructure pods +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