Bump k8s to 1.20 (#693)

The current 1.19 version is old enough. Signed-off-by: Quique Llorente <[email protected]>
nmstate · Feb 4, 2021 · 2ae804c · 2ae804c
1 parent 0ba6b98
commit 2ae804c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -38,7 +38,6 @@ WHAT ?= ./pkg ./controllers ./api
 
 unit_test_args ?=  -r -keepGoing --randomizeAllSpecs --randomizeSuites --race --trace $(UNIT_TEST_ARGS)
 
-export KUBEVIRT_PROVIDER ?= k8s-1.19
 export KUBEVIRT_NUM_NODES ?= 2 # 1 master, 1 worker needed for e2e tests
 export KUBEVIRT_NUM_SECONDARY_NICS ?= 2
 

diff --git a/automation/check-patch.e2e-k8s.sh b/automation/check-patch.e2e-k8s.sh
@@ -16,7 +16,7 @@ teardown() {
 }
 
 main() {
-    export KUBEVIRT_PROVIDER='k8s-1.19'
+    export KUBEVIRT_PROVIDER='k8s-1.20'
     export KUBEVIRT_NUM_NODES=3 # 1 master, 2 workers
     source automation/check-patch.setup.sh
     cd ${TMP_PROJECT_PATH}

diff --git a/automation/check-patch.e2e-operator-k8s.sh b/automation/check-patch.e2e-operator-k8s.sh
@@ -14,7 +14,7 @@ teardown() {
 }
 
 main() {
-    export KUBEVIRT_PROVIDER='k8s-1.19'
+    export KUBEVIRT_PROVIDER='k8s-1.20'
     export KUBEVIRT_NUM_NODES=3 # 1 master, 2 workers
     source automation/check-patch.setup.sh
     cd ${TMP_PROJECT_PATH}

diff --git a/cluster/kubevirtci.sh b/cluster/kubevirtci.sh
@@ -1,9 +1,11 @@
-export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.19'}
+export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.20'}
 
-KUBEVIRTCI_VERSION='d5d8e3e376b4c3b45824fbfe320b4c5175b37171'
+KUBEVIRTCI_VERSION='4a15921fbd605363b4a0dc893f8d19f8ac124b55'
 KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git'
 KUBEVIRTCI_PATH="${PWD}/_kubevirtci"
 
+export KUBEVIRTCI_TAG='2102030941-4a15921'
+
 function kubevirtci::_get_repo() {
     git --git-dir ${KUBEVIRTCI_PATH}/.git remote get-url origin
 }