Merge pull request #3014 from weaveworks/issues/3011-allow-non-pod-source

Allow any non-local traffic onto the weave bridge
This commit is contained in:
Marc Carré authored and GitHub committed 2017-06-14 14:52:11 +01:00
commit b655a3aede
2 files changed
+1 -2

No files matched your search

-1
View File
@@ -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
}
+1 -1
View File
@@ -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