From a905cdbba8a01f59c3eda06c3b7449c392d11ba2 Mon Sep 17 00:00:00 2001 From: Alvaro Aleman Date: Mon, 11 Feb 2019 23:00:11 +0100 Subject: [PATCH] Remove Kubernetes 1.10 from e2e tests --- test/e2e/provisioning/helper.go | 7 +++---- test/tools/integration/provision_master.sh | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/e2e/provisioning/helper.go b/test/e2e/provisioning/helper.go index 36487b8aa..f822802ce 100644 --- a/test/e2e/provisioning/helper.go +++ b/test/e2e/provisioning/helper.go @@ -17,10 +17,9 @@ var ( scenarios = buildScenarios() versions = []*semver.Version{ - semver.MustParse("v1.10.11"), - semver.MustParse("v1.11.5"), - semver.MustParse("v1.12.3"), - semver.MustParse("v1.13.0"), + semver.MustParse("v1.11.7"), + semver.MustParse("v1.12.5"), + semver.MustParse("v1.13.3"), } operatingSystems = []providerconfig.OperatingSystem{ diff --git a/test/tools/integration/provision_master.sh b/test/tools/integration/provision_master.sh index b14692971..77ed435f2 100755 --- a/test/tools/integration/provision_master.sh +++ b/test/tools/integration/provision_master.sh @@ -50,8 +50,8 @@ if ! which kubelet; then deb http://apt.kubernetes.io/ kubernetes-xenial main EOF apt-get update - apt-get install -y kubelet=1.13.0-00 kubeadm=1.13.0-00 kubectl=1.13.0-00 - kubeadm init --kubernetes-version=v1.13.0 --apiserver-advertise-address=$ADDR --pod-network-cidr=10.244.0.0/16 --service-cidr=172.16.0.0/12 + apt-get install -y kubelet=1.13.3-00 kubeadm=1.13.3-00 kubectl=1.13.3-00 + kubeadm init --kubernetes-version=v1.13.3 --apiserver-advertise-address=$ADDR --pod-network-cidr=10.244.0.0/16 --service-cidr=172.16.0.0/12 sed -i 's/\(.*leader-elect=true\)/\1\n - --feature-gates=ScheduleDaemonSetPods=false/g' /etc/kubernetes/manifests/kube-scheduler.yaml sed -i 's/\(.*leader-elect=true\)/\1\n - --feature-gates=ScheduleDaemonSetPods=false/g' /etc/kubernetes/manifests/kube-controller-manager.yaml fi