From 1c23f2aee2638b8cc3afd86ca30064a222c60adb Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Mon, 7 Oct 2024 09:42:27 +0100 Subject: [PATCH] WIP k8s-provider: Remove KUBEVIRT_CPU_MANAGER_POLICY Signed-off-by: Lee Yarwood --- cluster-up/cluster/k8s-provider-common.sh | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/cluster-up/cluster/k8s-provider-common.sh b/cluster-up/cluster/k8s-provider-common.sh index 32c4ede425..0c30442da9 100644 --- a/cluster-up/cluster/k8s-provider-common.sh +++ b/cluster-up/cluster/k8s-provider-common.sh @@ -39,23 +39,6 @@ function wait_for_kwok_ready() { fi } -function configure_cpu_manager() { - if [ ${KUBEVIRT_CPU_MANAGER_POLICY} == "static" ]; then - for node in $($kubectl get nodes -l "node-role.kubernetes.io/worker" --no-headers -o custom-columns=":metadata.name" | tr -d '\r'); do - # FIXME Replace with kubelet config drop ins once all providers are using k8s >= 1.28 - # https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/#kubelet-conf-d - $kubectl drain ${node} - $ssh ${node} -- sudo systemctl stop kubelet - # FIXME ${ssh} is broken when using HereDocs, fix and replace this mess if possible. - # https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/#configuration - $ssh ${node} -- "sudo rm -f /var/lib/kubelet/cpu_manager_state && sudo echo -e 'cpuManagerPolicy: static\nkubeReserved:\n cpu: \"1\"\n memory: \"1Gi\"\ncpuManagerPolicyOptions:\n full-pcpus-only: \"true\"' | sudo tee -a /var/lib/kubelet/config.yaml && sudo sed -i 's/cpuManagerReconcilePeriod\:\ 0s/cpuManagerReconcilePeriod\:\ 5s/g' /var/lib/kubelet/config.yaml" - $ssh ${node} -- sudo systemctl start kubelet - $kubectl label --overwrite node/${node} cpumanager=true - $kubectl uncordon ${node} - done - fi -} - function up() { params=$(_add_common_params) if echo "$params" | grep -q ERROR; then @@ -96,7 +79,6 @@ function up() { $kubectl label node -l $label node-role.kubernetes.io/worker='' configure_prometheus - configure_cpu_manager deploy_kwok