From 68ec51982ca6ead1ad9137717ba90d4912f58f12 Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Wed, 14 Aug 2024 14:33:00 +0200 Subject: [PATCH] e2e-setup: Use virt-operator to deploy common-instancetypes Use the bundled common-instancetypes deployed by virt-operator instead of deploying common-instancetypes manually. Signed-off-by: Felix Matouschek --- hack/e2e-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/e2e-setup.sh b/hack/e2e-setup.sh index 6bfc3d2..93d0607 100755 --- a/hack/e2e-setup.sh +++ b/hack/e2e-setup.sh @@ -30,7 +30,6 @@ set_default_params() { KUBEVIRT_VERSION=${KUBEVIRT_VERSION:-v1.2.2} KUBEVIRT_CDI_VERSION=${KUBEVIRT_CDI_VERSION:-v1.59.0} - KUBEVIRT_COMMON_INSTANCETYPES_VERSION=${KUBEVIRT_COMMON_INSTANCETYPES_VERSION:-v1.0.0} KUBEVIRT_USE_EMULATION=${KUBEVIRT_USE_EMULATION:-"false"} CNAO_VERSION=${CNAO_VERSION:-v0.93.0} @@ -244,7 +243,8 @@ deploy_kubevirt_containerized_data_importer() { deploy_kubevirt_common_instancetypes() { echo "Deploying KubeVirt common-instancetypes" - ${KUBECTL} apply -f "https://github.com/kubevirt/common-instancetypes/releases/download/${KUBEVIRT_COMMON_INSTANCETYPES_VERSION}/common-instancetypes-all-bundle-${KUBEVIRT_COMMON_INSTANCETYPES_VERSION}.yaml" + ${KUBECTL} patch kubevirt kubevirt --namespace kubevirt --type=merge --patch '{"spec":{"configuration":{"developerConfiguration":{"featureGates": ["CommonInstancetypesDeploymentGate"]}}}}' + ${KUBECTL} wait --for=condition=Available kubevirt kubevirt --namespace=kubevirt --timeout=5m } deploy_cnao() {