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 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 }