From d8bbd7fb07e2fcafd07a5c9080018c7360d89f49 Mon Sep 17 00:00:00 2001 From: Petr Horacek Date: Thu, 26 Sep 2019 14:04:54 +0200 Subject: [PATCH] bump k8s provider to 1.14.6 Let's test what is comming in OKD 4.2 beforehand by using newer Kubernetes for testing. Signed-off-by: Petr Horacek --- Makefile | 2 +- ...-patch.k8s-1.13.3.mounts => check-patch.k8s-1.14.6.mounts} | 0 ...ch.k8s-1.13.3.packages => check-patch.k8s-1.14.6.packages} | 0 .../{check-patch.k8s-1.13.3.sh => check-patch.k8s-1.14.6.sh} | 0 docs/developer-guide-commands.md | 4 ++-- hack/install-kubevirtci.sh | 2 +- stdci.yaml | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename automation/{check-patch.k8s-1.13.3.mounts => check-patch.k8s-1.14.6.mounts} (100%) rename automation/{check-patch.k8s-1.13.3.packages => check-patch.k8s-1.14.6.packages} (100%) rename automation/{check-patch.k8s-1.13.3.sh => check-patch.k8s-1.14.6.sh} (100%) diff --git a/Makefile b/Makefile index d11ee18b0..0a3384bf3 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ OPERATOR_SDK ?= build/_output/bin/operator-sdk GITHUB_RELEASE ?= build/_output/bin/github-release LOCAL_REGISTRY ?= registry:5000 -export KUBEVIRT_PROVIDER ?= k8s-1.13.3 +export KUBEVIRT_PROVIDER ?= k8s-1.14.6 export KUBEVIRT_NUM_NODES ?= 1 export KUBEVIRT_NUM_SECONDARY_NICS ?= 2 diff --git a/automation/check-patch.k8s-1.13.3.mounts b/automation/check-patch.k8s-1.14.6.mounts similarity index 100% rename from automation/check-patch.k8s-1.13.3.mounts rename to automation/check-patch.k8s-1.14.6.mounts diff --git a/automation/check-patch.k8s-1.13.3.packages b/automation/check-patch.k8s-1.14.6.packages similarity index 100% rename from automation/check-patch.k8s-1.13.3.packages rename to automation/check-patch.k8s-1.14.6.packages diff --git a/automation/check-patch.k8s-1.13.3.sh b/automation/check-patch.k8s-1.14.6.sh similarity index 100% rename from automation/check-patch.k8s-1.13.3.sh rename to automation/check-patch.k8s-1.14.6.sh diff --git a/docs/developer-guide-commands.md b/docs/developer-guide-commands.md index 3701cc8c9..c0fa16a0b 100644 --- a/docs/developer-guide-commands.md +++ b/docs/developer-guide-commands.md @@ -61,11 +61,11 @@ a new version is detrected the cluster command will re-install it. Use the following commands to control it: -*note:* The default Provider is one node (master + worker) of Kubernetes 1.13.1. +*note:* The default Provider is one node (master + worker) of Kubernetes 1.14.6. ```shell # Deploy local Kubernetes cluster -export KUBEVIRT_PROVIDER=k8s-1.13.1 # k8s-1.13.1 for Kubernetes or os-3.11.0 for OpenShift +export KUBEVIRT_PROVIDER=k8s-1.14.6 # k8s-1.14.6 for Kubernetes or os-3.11.0 for OpenShift export KUBEVIRT_NUM_NODES=3 # master + two nodes make cluster-up diff --git a/hack/install-kubevirtci.sh b/hack/install-kubevirtci.sh index 3f00afa1e..32a339151 100755 --- a/hack/install-kubevirtci.sh +++ b/hack/install-kubevirtci.sh @@ -1,7 +1,7 @@ #!/bin/bash -e organization=kubevirt -commit="db8c24bf830bb927f01829e6c9f083627fe6b832" +commit="c183644534f59c24e012940127c2c3a361510848" script_dir=$(dirname "$(readlink -f "$0")") kubevirtci_dir=kubevirtci diff --git a/stdci.yaml b/stdci.yaml index a80c01bd5..eaae2902f 100644 --- a/stdci.yaml +++ b/stdci.yaml @@ -1,5 +1,5 @@ sub-stages: - - k8s-1.13.3 + - k8s-1.14.6 - os-3.11.0 runtime_requirements: