From 414cbfb838fc1809756f7d1072d245f19c4ca789 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 27 Aug 2020 15:20:04 +0000 Subject: [PATCH] Simplify Kubernetes externalTrafficPolicy:local test There's no point stopping and starting the daemons now "no-masq-local" is the default. --- test/840_weave_kube_3_test.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/test/840_weave_kube_3_test.sh b/test/840_weave_kube_3_test.sh index c2f9af37..940661d9 100755 --- a/test/840_weave_kube_3_test.sh +++ b/test/840_weave_kube_3_test.sh @@ -361,19 +361,10 @@ sleep 2 assert_raises "$SSH $HOST1 $KUBECTL exec $denyPodName -- curl -s -S -f -m 2 http://$DOMAIN:8080/status >/dev/null" -# Passing --no-masq-local and setting externalTrafficPolicy to Local must preserve -# the client source IP addr +# Setting externalTrafficPolicy to Local must preserve the client source IP addr CLIENT_IP_MASQ="$($SSH $HOST1 curl -sS http://$HOST2:31138/client_ip)" -$SSH $HOST1 "$KUBECTL delete ds weave-net -n=kube-system" -sed -e "s%imagePullPolicy: Always%imagePullPolicy: Never%" \ - -e "s%env:%$WEAVE_ENV_VARS%" \ - "$(dirname "$0")/../prog/weave-kube/weave-daemonset-k8s-1.9.yaml" | run_on "$HOST1" "$KUBECTL apply -n kube-system -f -" - -sleep 2 -assert_raises 'wait_for_x check_connections "connections to establish"' - run_on $HOST1 "$KUBECTL patch svc netvirt -p '{\"spec\":{\"externalTrafficPolicy\":\"Local\"}}'" sleep 2