Merge pull request #278 from kubevirt-bot/cherry-pick-276-to-release-1.2

[release-1.2] Ensure `commonInstancetypesDeployment` is disabled, wait for resources to be deleted and stop using depreacted FGs
kubevirt · Nov 11, 2024 · b6ea271 · b6ea271
2 parents 41e2ae3 + 3c0f8b5
commit b6ea271
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/scripts/kubevirt.sh b/scripts/kubevirt.sh
@@ -39,7 +39,10 @@ function kubevirt::up() {
   make cluster-up -C "${_base_dir}/_kubevirt" && make cluster-sync -C "${_base_dir}/_kubevirt"
 
   echo "enabling feature gates to validate instance types and preferences"
-  ${_kubectl} patch kv/kubevirt -n kubevirt --type merge -p '{"spec":{"configuration":{"commonInstancetypesDeployment": {"enable": false},"developerConfiguration":{"featureGates": ["GPU", "NUMA", "VMPersistentState"]},"vmStateStorageClass":"nfs-csi"}}}'
+  ${_kubectl} patch kv/kubevirt -n kubevirt --type merge -p '{"spec":{"configuration":{"commonInstancetypesDeployment": {"enabled": false},"developerConfiguration":{"featureGates": ["VMPersistentState"]},"vmStateStorageClass":"nfs-csi"}}}'
+
+  echo "waiting for kubevirt to become ready, this can take a few minutes..."
+  ${_kubectl} -n kubevirt wait kv kubevirt --for condition=Available --timeout=15m
 }
 
 function kubevirt::down() {

diff --git a/scripts/kubevirtci.sh b/scripts/kubevirtci.sh
@@ -59,7 +59,10 @@ function kubevirtci::up() {
   ${_kubectl} -n kubevirt wait kv kubevirt --for condition=Available --timeout=15m
 
   echo "enabling feature gates to validate instance types and preferences"
-  ${_kubectl} patch kv/kubevirt -n kubevirt --type merge -p '{"spec":{"configuration":{"commonInstancetypesDeployment": {"enable": false},"developerConfiguration":{"featureGates": ["GPU", "NUMA", "VMPersistentState"]},"vmStateStorageClass":"nfs-csi"}}}'
+  ${_kubectl} patch kv/kubevirt -n kubevirt --type merge -p '{"spec":{"configuration":{"commonInstancetypesDeployment": {"enabled": false},"developerConfiguration":{"featureGates": ["VMPersistentState"]},"vmStateStorageClass":"nfs-csi"}}}'
+
+  echo "waiting for kubevirt to become ready, this can take a few minutes..."
+  ${_kubectl} -n kubevirt wait kv kubevirt --for condition=Available --timeout=15m
 }
 
 function kubevirtci::down() {