From f58d59580431610e49f9cc3176d09aa051412cc8 Mon Sep 17 00:00:00 2001 From: Tracey Bogue Date: Mon, 4 Oct 2021 08:15:53 -0500 Subject: [PATCH] Add flux-helm to list of platform namespaces. Testing: * Deployed ISO with changes. * Configured kube-cpu-mgr-policy=static. * Verified that helm-controller and source controller were running on platform CPUs. Story: 2009138 Task: 43078 Signed-off-by: Tracey Bogue Change-Id: Ib8b80fa924ebff99825326214035d1a38df24f73 --- ...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 ++-- ...kubelet-cpumanager-infrastructure-pods-use-system-re.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kubernetes/kubernetes-1.18.1/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch b/kubernetes/kubernetes-1.18.1/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch index 083e45c2f..a6ab5ddf4 100644 --- a/kubernetes/kubernetes-1.18.1/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch +++ b/kubernetes/kubernetes-1.18.1/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, -or notification namespaces. +notification or flux-helm 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 e631d5d6a74..e511caf7ab7 100644 +// Define namespaces used by platform infrastructure pods +var infraNamespaces = [...]string{ -+ "kube-system", "armada", "cert-manager", "platform-deployment-manager", "portieris", "vault", "notification", ++ "kube-system", "armada", "cert-manager", "platform-deployment-manager", "portieris", "vault", "notification", "flux-helm", +} + // staticPolicy is a CPU manager policy that does not change CPU diff --git a/kubernetes/kubernetes-1.19.13/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch b/kubernetes/kubernetes-1.19.13/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch index 8bcab0ce9..300958843 100644 --- a/kubernetes/kubernetes-1.19.13/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch +++ b/kubernetes/kubernetes-1.19.13/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, -or notification namespaces. +notification or flux-helm 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 4dc0e499fc4..ee960519127 100644 +// Define namespaces used by platform infrastructure pods +var infraNamespaces = [...]string{ -+ "kube-system", "armada", "cert-manager", "platform-deployment-manager", "portieris", "vault", "notification", ++ "kube-system", "armada", "cert-manager", "platform-deployment-manager", "portieris", "vault", "notification", "flux-helm", +} + // staticPolicy is a CPU manager policy that does not change CPU diff --git a/kubernetes/kubernetes-1.20.9/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch b/kubernetes/kubernetes-1.20.9/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch index 02bcecce2..baa1d2600 100644 --- a/kubernetes/kubernetes-1.20.9/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch +++ b/kubernetes/kubernetes-1.20.9/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, -or notification namespaces. +notification or flux-helm 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 e892d63641b..ab3206c5dc4 100644 +// Define namespaces used by platform infrastructure pods +var infraNamespaces = [...]string{ -+ "kube-system", "armada", "cert-manager", "platform-deployment-manager", "portieris", "vault", "notification", ++ "kube-system", "armada", "cert-manager", "platform-deployment-manager", "portieris", "vault", "notification", "flux-helm", +} + // staticPolicy is a CPU manager policy that does not change CPU diff --git a/kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch b/kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch index 63c6c4bde..7d9e05217 100644 --- a/kubernetes/kubernetes-1.21.3/centos/files/kubelet-cpumanager-infrastructure-pods-use-system-re.patch +++ b/kubernetes/kubernetes-1.21.3/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, -or notification namespaces. +notification or flux-helm 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", ++ "kube-system", "armada", "cert-manager", "platform-deployment-manager", "portieris", "vault", "notification", "flux-helm", +} + // staticPolicy is a CPU manager policy that does not change CPU