From 2825bf712322bbb21006b02bdfaf3bd20ccadcc3 Mon Sep 17 00:00:00 2001 From: Mikael Svensson Date: Thu, 10 Mar 2022 10:50:12 +0100 Subject: [PATCH] Only check if route overlaps routes with scope: LINK Signed-off-by: Mikael Svensson --- hack/dockerfile/install/proxy.installer | 2 +- vendor.conf | 2 +- vendor/github.com/docker/libnetwork/netutils/utils_linux.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/dockerfile/install/proxy.installer b/hack/dockerfile/install/proxy.installer index 3b0bb4b486..e9a29a972f 100755 --- a/hack/dockerfile/install/proxy.installer +++ b/hack/dockerfile/install/proxy.installer @@ -3,7 +3,7 @@ # LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When # updating the binary version, consider updating github.com/docker/libnetwork # in vendor.conf accordingly -: "${LIBNETWORK_COMMIT:=64b7a4574d1426139437d20e81c0b6d391130ec8}" +: "${LIBNETWORK_COMMIT:=339b972b464ee3d401b5788b2af9e31d09d6b7da}" install_proxy() { case "$1" in diff --git a/vendor.conf b/vendor.conf index e1ca33ce5c..2d5660b4bb 100644 --- a/vendor.conf +++ b/vendor.conf @@ -47,7 +47,7 @@ github.com/grpc-ecosystem/go-grpc-middleware 3c51f7f332123e8be5a157c0802a # libnetwork # When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly -github.com/docker/libnetwork 64b7a4574d1426139437d20e81c0b6d391130ec8 +github.com/docker/libnetwork 339b972b464ee3d401b5788b2af9e31d09d6b7da github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec diff --git a/vendor/github.com/docker/libnetwork/netutils/utils_linux.go b/vendor/github.com/docker/libnetwork/netutils/utils_linux.go index 4d2376437a..bd091618ab 100644 --- a/vendor/github.com/docker/libnetwork/netutils/utils_linux.go +++ b/vendor/github.com/docker/libnetwork/netutils/utils_linux.go @@ -31,7 +31,7 @@ func CheckRouteOverlaps(toCheck *net.IPNet) error { return err } for _, network := range networks { - if network.Dst != nil && NetworkOverlaps(toCheck, network.Dst) { + if network.Dst != nil && network.Scope == netlink.SCOPE_LINK && NetworkOverlaps(toCheck, network.Dst) { return ErrNetworkOverlaps } }