From 3bea2ae419bd88a8241d01b7344cd4586104a924 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 28 Jun 2018 09:25:56 +0000 Subject: [PATCH 1/2] Bump to Kubernetes 1.11 --- DEPENDENCIES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 0d67d05b..b045b8e1 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,3 +1,3 @@ DOCKER_VERSION=17.06 -KUBERNETES_VERSION=1.10.0 +KUBERNETES_VERSION=1.11.0 KUBERNETES_CNI_VERSION=0.6.0 From 32a92a46951acecb0de4461833697a1625bcde13 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 28 Jun 2018 10:26:09 +0000 Subject: [PATCH 2/2] Add --force flag to kubeadm reset --- test/840_weave_kube_3_test.sh | 2 +- test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh index cd8829fe..18f1df9f 100755 --- a/test/840_weave_kube_3_test.sh +++ b/test/840_weave_kube_3_test.sh @@ -4,7 +4,7 @@ tear_down_kubeadm() { for host in $HOSTS; do - run_on $host "sudo kubeadm reset && sudo rm -r -f /opt/cni/bin/*weave*" + run_on $host "sudo kubeadm reset --force && sudo rm -r -f /opt/cni/bin/*weave*" # Remove the rule to ensure that api-server is not accessible while kube-proxy # is not ready. Otherwise, we have a race between "-j KUBE-FORWARD" and "-j WEAVE-NPC" # which makes the NodePort isolation test case to fail. diff --git a/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh b/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh index 33dcdcfb..1df118af 100755 --- a/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh +++ b/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh @@ -27,7 +27,7 @@ fi function teardown_kubernetes_cluster { greyly echo "Tearing down kubernetes cluster" for host in $HOSTS; do - run_on $host "sudo kubeadm reset && sudo rm -r -f /opt/cni/bin/*weave*" + run_on $host "sudo kubeadm reset --force && sudo rm -r -f /opt/cni/bin/*weave*" done }