diff --git a/cluster-up/cluster/kind-1.23-sriov/provider.sh b/cluster-up/cluster/kind-1.23-sriov/provider.sh index 4452c35116..56338dbea5 100755 --- a/cluster-up/cluster/kind-1.23-sriov/provider.sh +++ b/cluster-up/cluster/kind-1.23-sriov/provider.sh @@ -51,6 +51,7 @@ function up() { echo "" cp $KIND_MANIFESTS_DIR/kind.yaml ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml + export CONFIG_WORKER_CPU_MANAGER=true kind_up configure_registry_proxy diff --git a/cluster-up/cluster/kind-1.23/provider.sh b/cluster-up/cluster/kind-1.23/provider.sh index a79059d299..a68d2b9a4d 100755 --- a/cluster-up/cluster/kind-1.23/provider.sh +++ b/cluster-up/cluster/kind-1.23/provider.sh @@ -33,8 +33,9 @@ function configure_registry_proxy() { function up() { cp $KIND_MANIFESTS_DIR/kind.yaml ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml - _add_worker_kubeadm_config_patch - _add_worker_extra_mounts + _add_kubeadm_cpu_manager_config_patch + _add_extra_mounts + export CONFIG_CPU_MANAGER=true kind_up configure_registry_proxy diff --git a/cluster-up/cluster/kind-1.23-vgpu/README.md b/cluster-up/cluster/kind-1.25-vgpu/README.md similarity index 100% rename from cluster-up/cluster/kind-1.23-vgpu/README.md rename to cluster-up/cluster/kind-1.25-vgpu/README.md diff --git a/cluster-up/cluster/kind-1.23-vgpu/config_vgpu_cluster.sh b/cluster-up/cluster/kind-1.25-vgpu/config_vgpu_cluster.sh similarity index 100% rename from cluster-up/cluster/kind-1.23-vgpu/config_vgpu_cluster.sh rename to cluster-up/cluster/kind-1.25-vgpu/config_vgpu_cluster.sh diff --git a/cluster-up/cluster/kind-1.23-vgpu/conformance.json b/cluster-up/cluster/kind-1.25-vgpu/conformance.json similarity index 100% rename from cluster-up/cluster/kind-1.23-vgpu/conformance.json rename to cluster-up/cluster/kind-1.25-vgpu/conformance.json diff --git a/cluster-up/cluster/kind-1.23-vgpu/provider.sh b/cluster-up/cluster/kind-1.25-vgpu/provider.sh similarity index 89% rename from cluster-up/cluster/kind-1.23-vgpu/provider.sh rename to cluster-up/cluster/kind-1.25-vgpu/provider.sh index 5d2d6ae741..7befb02a20 100755 --- a/cluster-up/cluster/kind-1.23-vgpu/provider.sh +++ b/cluster-up/cluster/kind-1.25-vgpu/provider.sh @@ -14,8 +14,8 @@ else fi function set_kind_params() { - export KIND_VERSION="${KIND_VERSION:-0.11.1}" - export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-quay.io/kubevirtci/kindest_node:v1.23.3@sha256:0df8215895129c0d3221cda19847d1296c4f29ec93487339149333bd9d899e5a}" + export KIND_VERSION="${KIND_VERSION:-0.17.0}" + export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-quay.io/kubevirtci/kindest-node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace}" export KUBECTL_PATH="${KUBECTL_PATH:-/bin/kubectl}" } @@ -41,8 +41,7 @@ function up() { echo "" cp $KIND_MANIFESTS_DIR/kind.yaml ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml - _add_worker_kubeadm_config_patch - _add_worker_extra_mounts + _add_extra_mounts kind_up configure_registry_proxy diff --git a/cluster-up/cluster/kind-1.23-vgpu/vgpu-node/node.sh b/cluster-up/cluster/kind-1.25-vgpu/vgpu-node/node.sh similarity index 100% rename from cluster-up/cluster/kind-1.23-vgpu/vgpu-node/node.sh rename to cluster-up/cluster/kind-1.25-vgpu/vgpu-node/node.sh diff --git a/cluster-up/cluster/kind/common.sh b/cluster-up/cluster/kind/common.sh index 1bbedb63dd..45df5cd5d1 100755 --- a/cluster-up/cluster/kind/common.sh +++ b/cluster-up/cluster/kind/common.sh @@ -7,6 +7,7 @@ function detect_cri() { } export CRI_BIN=${CRI_BIN:-$(detect_cri)} +CONFIG_WORKER_CPU_MANAGER=${CONFIG_WORKER_CPU_MANAGER:-false} # check CPU arch PLATFORM=$(uname -m) @@ -226,7 +227,7 @@ function setup_kind() { prepare_config } -function _add_worker_extra_mounts() { +function _add_extra_mounts() { cat <> ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml extraMounts: - containerPath: /var/log/audit @@ -242,7 +243,7 @@ EOF fi } -function _add_worker_kubeadm_config_patch() { +function _add_kubeadm_cpu_manager_config_patch() { cat << EOF >> ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml kubeadmConfigPatches: - |- @@ -262,8 +263,10 @@ function _add_workers() { cat << EOF >> ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml - role: worker EOF - _add_worker_kubeadm_config_patch - _add_worker_extra_mounts + if [ $CONFIG_WORKER_CPU_MANAGER == true ]; then + _add_kubeadm_cpu_manager_config_patch + fi + _add_extra_mounts done }