Merge pull request #3340 from weaveworks/k8s-1-11

Update smoke tests to use Kubernetes 1.11

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

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.

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
 }