From 2630994b35e81b4b5913dfb059b99f416214efe3 Mon Sep 17 00:00:00 2001 From: Ameya Gawde Date: Tue, 17 Nov 2020 16:03:27 -0800 Subject: [PATCH] Bump libnetwork Signed-off-by: Ameya Gawde --- hack/dockerfile/install/proxy.installer | 2 +- vendor.conf | 2 +- vendor/github.com/docker/libnetwork/service_linux.go | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hack/dockerfile/install/proxy.installer b/hack/dockerfile/install/proxy.installer index d8caa0c21b..4810f59b1a 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:=d511c60c5c23e6753631244f271a1ec6097254a5}" +: "${LIBNETWORK_COMMIT:=6b51d028f4bbb9a4cc8d3eaba13baa9f848af546}" install_proxy() { case "$1" in diff --git a/vendor.conf b/vendor.conf index 70e4c86cd0..eb1c2d4f68 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 d511c60c5c23e6753631244f271a1ec6097254a5 +github.com/docker/libnetwork 6b51d028f4bbb9a4cc8d3eaba13baa9f848af546 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/service_linux.go b/vendor/github.com/docker/libnetwork/service_linux.go index 66c8be6b97..514c65a753 100644 --- a/vendor/github.com/docker/libnetwork/service_linux.go +++ b/vendor/github.com/docker/libnetwork/service_linux.go @@ -67,11 +67,12 @@ func (n *network) findLBEndpointSandbox() (*endpoint, *sandbox, error) { if !ok { return nil, nil, fmt.Errorf("Unable to get sandbox for %s(%s) in for %s", ep.Name(), ep.ID(), n.ID()) } - ep = sb.getEndpoint(ep.ID()) - if ep == nil { + var sep *endpoint + sep = sb.getEndpoint(ep.ID()) + if sep == nil { return nil, nil, fmt.Errorf("Load balancing endpoint %s(%s) removed from %s", ep.Name(), ep.ID(), n.ID()) } - return ep, sb, nil + return sep, sb, nil } // Searches the OS sandbox for the name of the endpoint interface