diff --git a/cluster-provision/gocli/opts/nodes/testconfig.go b/cluster-provision/gocli/opts/nodes/testconfig.go index f0a00461ad..41ba16ee8f 100644 --- a/cluster-provision/gocli/opts/nodes/testconfig.go +++ b/cluster-provision/gocli/opts/nodes/testconfig.go @@ -6,7 +6,7 @@ func AddExpectCalls(sshClient *kubevirtcimocks.MockSSHClient) { cmds := []string{ "source /var/lib/kubevirtci/shared_vars.sh", `timeout=30; interval=5; while ! hostnamectl | grep Transient; do echo "Waiting for dhclient to set the hostname from dnsmasq"; sleep $interval; timeout=$((timeout - interval)); [ $timeout -le 0 ] && exit 1; done`, - `echo "KUBELET_EXTRA_ARGS=--cgroup-driver=systemd --runtime-cgroups=/systemd/system.slice --kubelet-cgroups=/systemd/system.slice --fail-swap-on=false --feature-gates=NodeSwap=true,CPUManager=true --cpu-manager-policy=static --kube-reserved=cpu=500m --system-reserved=cpu=500m" | tee /etc/sysconfig/kubelet > /dev/null`, + `echo "KUBELET_EXTRA_ARGS=--cgroup-driver=systemd --runtime-cgroups=/systemd/system.slice --kubelet-cgroups=/systemd/system.slice --fail-swap-on=false --feature-gates=NodeSwap=true --cpu-manager-policy=static --kube-reserved=cpu=500m --system-reserved=cpu=500m" | tee /etc/sysconfig/kubelet > /dev/null`, "systemctl daemon-reload && service kubelet restart", "swapoff -a", "until ip address show dev eth0 | grep global | grep inet6; do sleep 1; done", diff --git a/cluster-up/cluster/kind/common.sh b/cluster-up/cluster/kind/common.sh index e63614b924..d207fda936 100755 --- a/cluster-up/cluster/kind/common.sh +++ b/cluster-up/cluster/kind/common.sh @@ -266,7 +266,6 @@ function _add_kubeadm_cpu_manager_config_patch() { kind: JoinConfiguration nodeRegistration: kubeletExtraArgs: - "feature-gates": "CPUManager=true" "cpu-manager-policy": "static" "kube-reserved": "cpu=500m" "system-reserved": "cpu=500m"