From bfa95d75c04babc3188d43634eed48c4ce26f6d4 Mon Sep 17 00:00:00 2001 From: Or Shoval Date: Tue, 6 Aug 2024 10:57:37 +0300 Subject: [PATCH] kubevirt: Fix deploying kubevirt on git actions Signed-off-by: Or Shoval --- .../check-patch.e2e-kubevirt-ipam-controller-functests.sh | 2 +- automation/components-functests.setup.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/check-patch.e2e-kubevirt-ipam-controller-functests.sh b/automation/check-patch.e2e-kubevirt-ipam-controller-functests.sh index 21da580254..a54b432a44 100755 --- a/automation/check-patch.e2e-kubevirt-ipam-controller-functests.sh +++ b/automation/check-patch.e2e-kubevirt-ipam-controller-functests.sh @@ -42,10 +42,10 @@ main() { cd ${TMP_PROJECT_PATH} export KUBEVIRT_PROVIDER=external export DEV_IMAGE_REGISTRY=localhost:5000 + ./hack/deploy-kubevirt.sh ./cluster/cert-manager-install.sh deploy_cnao deploy_cnao_cr - ./hack/deploy-kubevirt.sh cd ${TMP_COMPONENT_PATH} echo "Run kubevirt-ipam-controller functional tests" diff --git a/automation/components-functests.setup.sh b/automation/components-functests.setup.sh index 14a0a162e8..bdde9a562a 100644 --- a/automation/components-functests.setup.sh +++ b/automation/components-functests.setup.sh @@ -66,9 +66,6 @@ spec: kubeMacPool: rangeStart: "02:00:00:00:00:00" rangeEnd: "02:00:00:00:00:0F" - ovs: {} - macvtap: {} - kubeSecondaryDNS: {} kubevirtIpamController: {} imagePullPolicy: Always EOF @@ -76,6 +73,9 @@ EOF if [[ $USE_KUBEVIRTCI == true ]]; then echo " multus: {}" >> cr.yaml echo " multusDynamicNetworks: {}" >> cr.yaml + echo " ovs: {}" >> cr.yaml + echo " macvtap: {}" >> cr.yaml + echo " kubeSecondaryDNS: {}" >> cr.yaml fi cluster/kubectl.sh apply -f cr.yaml