kind: provider scripts consider KUBEVIRTCI_PATH (#1284)

The env variable is considered by the standard k8s providers, but not by the kind providers. This change lets them consider the env var. Signed-off-by: Daniel Hiller <[email protected]>
kubevirt · Oct 1, 2024 · e60d15b · e60d15b
1 parent d5c1f38
commit e60d15b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cluster-up/cluster/kind-1.28/provider.sh b/cluster-up/cluster/kind-1.28/provider.sh
@@ -14,10 +14,10 @@ else
 fi
 
 function set_kind_params() {
-    version=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/version)
+    version=$(cat "${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/version")
     export KIND_VERSION="${KIND_VERSION:-$version}"
 
-    image=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/image)
+    image=$(cat "${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/image")
     export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-$image}"
 }
 

diff --git a/cluster-up/cluster/kind-1.30-vgpu/provider.sh b/cluster-up/cluster/kind-1.30-vgpu/provider.sh
@@ -14,10 +14,10 @@ else
 fi
 
 function set_kind_params() {
-    version=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/version)
+    version=$(cat "${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/version")
     export KIND_VERSION="${KIND_VERSION:-$version}"
 
-    image=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/image)
+    image=$(cat "${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/image")
     export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-$image}"
 }
 

diff --git a/cluster-up/cluster/kind-ovn/provider.sh b/cluster-up/cluster/kind-ovn/provider.sh
@@ -81,7 +81,7 @@ function down() {
 }
 
 function _kubectl() {
-    export KUBECONFIG=$(./cluster-up/kubeconfig.sh)
+    export KUBECONFIG=$(${KUBEVIRTCI_PATH}/kubeconfig.sh)
     kubectl "$@"
 }
 

diff --git a/cluster-up/cluster/kind-sriov/provider.sh b/cluster-up/cluster/kind-sriov/provider.sh
@@ -21,10 +21,10 @@ function print_available_nics() {
 }
 
 function set_kind_params() {
-    version=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/version)
+    version=$(cat "${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/version")
     export KIND_VERSION="${KIND_VERSION:-$version}"
 
-    image=$(cat cluster-up/cluster/$KUBEVIRT_PROVIDER/image)
+    image=$(cat "${KUBEVIRTCI_PATH}/cluster/$KUBEVIRT_PROVIDER/image")
     export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-$image}"
 }