Merge pull request #3 from kubevirt/minor_infra_fixes

infra: allow KUBEVIRT_PROVIDER override
kubevirt · Feb 6, 2020 · 327b499 · 327b499
2 parents 705ff68 + 0bcdcdd
commit 327b499
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cluster/kubevirtci.sh b/cluster/kubevirtci.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-export KUBEVIRT_PROVIDER='k8s-1.14.6'
+
+export KUBEVIRT_PROVIDER="${KUBEVIRT_PROVIDER:-k8s-multus-1.13.3}"
 
 KUBEVIRTCI_VERSION='0e5b027098796137a9b95aed57943061e185bfcd'
 KUBEVIRTCI_PATH="${PWD}/_kubevirtci"

diff --git a/cluster/up.sh b/cluster/up.sh
@@ -13,6 +13,6 @@ echo 'The cluster is ready!'
 echo 'Use following command to install macvtap-cni on the cluster:'
 echo '  make cluster-sync'
 echo 'Use following command to access cluster API:'
-echo '  ./kubevirtci/cluster-up/kubectl.sh get nodes'
+echo '  ./cluster/kubectl.sh get nodes'
 echo 'Use following command to ssh into cluster node:'
-echo '  ./kubevirtci/cluster-up/cli.sh ssh node01'
+echo '  ./cluster/cli.sh ssh node01'