kind, vgpu: Bump vgpu kind to k8s-1.25 (#979)

* kind: Bump vgpu kind to k8s-1.25 Do not config cpu manager for vgpu, because kind 1.24+ has this bug for cpu manager: kubernetes-sigs/kind#2999 Since we don't use cpu manager on vgpu lane we can bump to k8s-1.25 and remove cpu manager. Rename lane. Signed-off-by: Or Shoval <[email protected]> * kind: Rename functions The functions can add extra mounts / cpu manager to non worker nodes, it depends where it is called. If it is called before the worker snippet in the manifest it will configure it for the control-plane, otherwise for the worker node. Rename it to reflect it. Signed-off-by: Or Shoval <[email protected]> --------- Signed-off-by: Or Shoval <[email protected]>
kubevirt · Mar 9, 2023 · 3e52bb0 · 3e52bb0
1 parent 7e486e5
commit 3e52bb0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git 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
@@ -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 → cluster-up/cluster/kind-1.25-vgpu/README.md b/cluster-up/cluster/kind-1.23-vgpu/README.md → cluster-up/cluster/kind-1.25-vgpu/README.md
diff --git a/...ter/kind-1.23-vgpu/config_vgpu_cluster.sh → ...ter/kind-1.25-vgpu/config_vgpu_cluster.sh b/...ter/kind-1.23-vgpu/config_vgpu_cluster.sh → ...ter/kind-1.25-vgpu/config_vgpu_cluster.sh
diff --git a/...p/cluster/kind-1.23-vgpu/conformance.json → ...p/cluster/kind-1.25-vgpu/conformance.json b/...p/cluster/kind-1.23-vgpu/conformance.json → ...p/cluster/kind-1.25-vgpu/conformance.json
diff --git a/...ter-up/cluster/kind-1.23-vgpu/provider.sh → ...ter-up/cluster/kind-1.25-vgpu/provider.sh b/...ter-up/cluster/kind-1.23-vgpu/provider.sh → ...ter-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/kind-1.23-vgpu/vgpu-node/node.sh → .../cluster/kind-1.25-vgpu/vgpu-node/node.sh b/.../cluster/kind-1.23-vgpu/vgpu-node/node.sh → .../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
@@ -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 <<EOF >> ${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
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@