From 98fec7e5aa47394ba08ff79cf52349b0b9b135c3 Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Thu, 6 Apr 2017 10:43:56 +0100 Subject: [PATCH 1/3] Revert "Disable temporary 840 smoke tests" This reverts commit b687484dda2a5eaf3b839a65441aaf30f9048f9c. --- .lintignore | 1 - test/{840_weave_kube_3_disabled.sh => 840_weave_kube_3_test.sh} | 0 2 files changed, 1 deletion(-) rename test/{840_weave_kube_3_disabled.sh => 840_weave_kube_3_test.sh} (100%) diff --git a/.lintignore b/.lintignore index d43f6af0..f6b9efd0 100644 --- a/.lintignore +++ b/.lintignore @@ -16,7 +16,6 @@ prog/weave-kube/launch.sh prog/weaveexec/symlink test/*_test.sh test/600_proxy_docker_py.sh -test/840_* test/assert.sh test/config.sh test/gce.sh diff --git a/test/840_weave_kube_3_disabled.sh b/test/840_weave_kube_3_test.sh similarity index 100% rename from test/840_weave_kube_3_disabled.sh rename to test/840_weave_kube_3_test.sh From 520a72c8e6579fcedf4451a260dce339a93a7c88 Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Thu, 6 Apr 2017 10:47:30 +0100 Subject: [PATCH 2/3] Lock kubeadm's Kubernetes version. Without this commit, `kubeadm` typically upgrades whichever version of Kubernetes is installed, sometimes leading to conflicts in between components' version. This fixes the issue behind #2876 and should avoid build failures like [weave/8373](https://circleci.com/gh/weaveworks/weave/8373). --- test/840_weave_kube_3_test.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh index d206524e..8b0a5214 100755 --- a/test/840_weave_kube_3_test.sh +++ b/test/840_weave_kube_3_test.sh @@ -24,7 +24,11 @@ tear_down_kubeadm docker_on $HOST1 run --rm --privileged --net=host --entrypoint=/usr/sbin/ipset weaveworks/weave-npc create test_840_ipset bitmap:ip range 192.168.1.0/24 || true docker_on $HOST1 run --rm --privileged --net=host --entrypoint=/usr/sbin/ipset weaveworks/weave-npc add test_840_ipset 192.168.1.11 -run_on $HOST1 "sudo systemctl start kubelet && sudo kubeadm init --token=$TOKEN" +# kubeadm init upgrades to latest Kubernetes version by default, therefore we try to lock the version using the below option: +k8s_version="$(run_on $HOST1 "kubelet --version" | grep -oP "(?<=Kubernetes )v[\d\.\-beta]+")" +k8s_version_option="$([[ "$k8s_version" > "v1.6" ]] && echo "kubernetes-version" || echo "use-kubernetes-version")" + +run_on $HOST1 "sudo systemctl start kubelet && sudo kubeadm init --$k8s_version_option=$k8s_version --token=$TOKEN" run_on $HOST2 "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN $HOST1IP" run_on $HOST3 "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN $HOST1IP" From 1c797ca9015b5ff160277f3208f4d2d4fa7ed24a Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Thu, 6 Apr 2017 11:36:51 +0100 Subject: [PATCH 3/3] Upgrade to latest version of build-tools. This brings a fix to the Ansible playbook which enables locking of `kubeadm`'s Kubernetes version. --- tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools b/tools index faaaa6f2..cf87ca33 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit faaaa6f2cc92ff348b4a6102ae7378629a18d577 +Subproject commit cf87ca33a1775de36bf793615513c85e07907466