From 2584335b1143f337f0611a1053cc5e999f748f70 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 12 Jun 2017 17:00:57 +0000 Subject: [PATCH 1/2] Allow any non-local traffic onto the weave bridge If it's destined for a pod on another node it will be checked again when it reaches that other node. The previous version was rejecting traffic coming in from outside the cluster. --- prog/weave-npc/main.go | 1 - 1 file changed, 1 deletion(-) diff --git a/prog/weave-npc/main.go b/prog/weave-npc/main.go index c3d3e14e..7e877c00 100644 --- a/prog/weave-npc/main.go +++ b/prog/weave-npc/main.go @@ -117,7 +117,6 @@ func createBaseRules(ipt *iptables.IPTables, ips ipset.Interface) error { return err } if err := ipt.Append(npc.TableFilter, npc.MainChain, - "-m", "set", "--match-set", npc.LocalIpset, "src", "-m", "set", "!", "--match-set", npc.LocalIpset, "dst", "-j", "ACCEPT"); err != nil { return err } From 819b395ae47c227750b4ecd069d0d8895025b63a Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 14 Jun 2017 13:14:00 +0000 Subject: [PATCH 2/2] Temporarily raise the test timeout Docker 1.11 seems much slower at the pull tests than Docker 1.13 while we investigate that, raise the timeout to allow tests to pass --- test/run_all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run_all.sh b/test/run_all.sh index 7d8c6edd..bb2cfcf2 100755 --- a/test/run_all.sh +++ b/test/run_all.sh @@ -23,4 +23,4 @@ if [ -n "$CIRCLECI" -o -n "$PARALLEL" ]; then RUNNER_ARGS="$RUNNER_ARGS -parallel" fi -HOSTS="$HOSTS" "${DIR}/../tools/runner/runner" $RUNNER_ARGS $TESTS +HOSTS="$HOSTS" "${DIR}/../tools/runner/runner" -timeout=240 $RUNNER_ARGS $TESTS