Run cd ../kubevirt && make bump-kubevirtci

Signed-off-by: kubevirt-bot <[email protected]>

cluster-up-sha.txt

@@ -1 +1 @@
-e9008afc80793ec5c4f1674068dfe342cc27ab5b
+62063771791ff39ec980f43b355548b88cd1b958

cluster-up/cluster/ephemeral-provider-common.sh

@@ -73,7 +73,9 @@ function _registry_volume() {
 function _add_common_params() {
     # shellcheck disable=SC2155
     local params="--nodes ${KUBEVIRT_NUM_NODES} --memory ${KUBEVIRT_MEMORY_SIZE} --cpu 6 --secondary-nics ${KUBEVIRT_NUM_SECONDARY_NICS} --random-ports --background --prefix $provider_prefix --registry-volume $(_registry_volume) ${KUBEVIRT_PROVIDER} ${KUBEVIRT_PROVIDER_EXTRA_ARGS}"
-    if [[ $TARGET =~ windows.* ]] && [ -n "$WINDOWS_NFS_DIR" ]; then
+    if [[ $TARGET =~ windows_sysprep.* ]] && [ -n "$WINDOWS_SYSPREP_NFS_DIR" ]; then
+        params=" --nfs-data $WINDOWS_SYSPREP_NFS_DIR $params"
+    elif [[ $TARGET =~ windows.* ]] && [ -n "$WINDOWS_NFS_DIR" ]; then
         params=" --nfs-data $WINDOWS_NFS_DIR $params"
     elif [[ $TARGET =~ os-.* ]] && [ -n "$RHEL_NFS_DIR" ]; then
         params=" --nfs-data $RHEL_NFS_DIR $params"

cluster-up/cluster/k8s-1.20/README.md

@@ -35,6 +35,15 @@ make cluster-up
 To get more info about CNAO you can check the github project documentation
 here https://github.com/kubevirt/cluster-network-addons-operator
 
+## Bringing the cluster up with cgroup v2
+
+```bash
+export KUBEVIRT_PROVIDER=k8s-1.20
+export KUBEVIRT_NUM_NODES=2 # master + one node
+export KUBEVIRT_CGROUPV2=true
+make cluster-up
+```
+
 ## Bringing the cluster down
 
 ```bash

cluster-up/cluster/k8s-1.20/provider.sh

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
 set -e
+
+if [ "${KUBEVIRT_CGROUPV2}" == "true" ]; then
+    export KUBEVIRT_PROVIDER_EXTRA_ARGS="${KUBEVIRT_PROVIDER_EXTRA_ARGS} --kernel-args='systemd.unified_cgroup_hierarchy=1'"
+fi
+
 # shellcheck disable=SC1090
 source "${KUBEVIRTCI_PATH}/cluster/k8s-provider-common.sh"

cluster-up/cluster/k8s-1.21/README.md

@@ -35,6 +35,15 @@ make cluster-up
 To get more info about CNAO you can check the github project documentation
 here https://github.com/kubevirt/cluster-network-addons-operator
 
+## Bringing the cluster up with cgroup v2
+
+```bash
+export KUBEVIRT_PROVIDER=k8s-1.20
+export KUBEVIRT_NUM_NODES=2 # master + one node
+export KUBEVIRT_CGROUPV2=true
+make cluster-up
+```
+
 ## Bringing the cluster down
 
 ```bash

cluster-up/cluster/k8s-1.21/provider.sh

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
 set -e
+
+if [ "${KUBEVIRT_CGROUPV2}" == "true" ]; then
+    export KUBEVIRT_PROVIDER_EXTRA_ARGS="${KUBEVIRT_PROVIDER_EXTRA_ARGS} --kernel-args='systemd.unified_cgroup_hierarchy=1'"
+fi
+
 # shellcheck disable=SC1090
 source "${KUBEVIRTCI_PATH}/cluster/k8s-provider-common.sh"

cluster-up/hack/common.sh

@@ -25,6 +25,7 @@ KUBEVIRT_DEPLOY_ISTIO=${KUBEVIRT_DEPLOY_ISTIO:-false}
 KUBEVIRT_DEPLOY_PROMETHEUS=${KUBEVIRT_DEPLOY_PROMETHEUS:-false}
 KUBEVIRT_DEPLOY_PROMETHEUS_ALERTMANAGER=${KUBEVIRT_DEPLOY_PROMETHEUS_ALERTMANAGER-false}
 KUBEVIRT_DEPLOY_GRAFANA=${KUBEVIRT_DEPLOY_GRAFANA:-false}
+KUBEVIRT_CGROUPV2=${KUBEVIRT_CGROUPV2:-false}
 
 # If on a developer setup, expose ocp on 8443, so that the openshift web console can be used (the port is important because of auth redirects)
 # http and https ports are accessed by testing framework and should not be randomized
@@ -38,4 +39,4 @@ provider_prefix=${JOB_NAME:-${KUBEVIRT_PROVIDER}}${EXECUTOR_NUMBER}
 job_prefix=${JOB_NAME:-kubevirt}${EXECUTOR_NUMBER}
 
 mkdir -p $KUBEVIRTCI_CONFIG_PATH/$KUBEVIRT_PROVIDER
-KUBEVIRTCI_TAG=2107011205-2135fb7
+KUBEVIRTCI_TAG=2107080951-4492ebe

cluster-up/version.txt

@@ -1 +1 @@
-2107011205-2135fb7
+2107080951-4492ebe

hack/config-default.sh

@@ -11,7 +11,7 @@ cdi_namespace=cdi
 image_pull_policy=${IMAGE_PULL_POLICY:-IfNotPresent}
 verbosity=${VERBOSITY:-2}
 package_name=${PACKAGE_NAME:-kubevirt-dev}
-kubevirtci_git_hash="2107011205-2135fb7"
+kubevirtci_git_hash="2107080951-4492ebe"
 conn_check_ipv4_address=${CONN_CHECK_IPV4_ADDRESS:-""}
 conn_check_ipv6_address=${CONN_CHECK_IPV6_ADDRESS:-""}
 conn_check_dns=${CONN_CHECK_DNS:-""}