diff options
| author | Ameya Gawde <agawde@mirantis.com> | 2020-11-17 16:17:09 -0800 |
|---|---|---|
| committer | Ameya Gawde <agawde@mirantis.com> | 2020-11-17 16:21:39 -0800 |
| commit | f80f6304e27d2a3aa19638c45c96e63adfd47087 (patch) | |
| tree | bb1300d60620734398b7f37df461ba1b8730f628 | |
| parent | 837baebb7430a34f1b4d5246de52eb25ca0a0aa0 (diff) | |
| download | docker-f80f6304e27d2a3aa19638c45c96e63adfd47087.tar.gz | |
Bump libnetwork
Signed-off-by: Ameya Gawde <agawde@mirantis.com>
| -rwxr-xr-x | hack/dockerfile/install/proxy.installer | 2 | ||||
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | 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 d26421446f..01afbdb33d 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:=026aabaa659832804b01754aaadd2c0f420c68b6} # bump_19.03 branch +: ${LIBNETWORK_COMMIT:=55e924b8a84231a065879156c0de95aefc5f5435} # bump_19.03 branch install_proxy() { case "$1" in diff --git a/vendor.conf b/vendor.conf index 2017493d1e..bfdcc17054 100644 --- a/vendor.conf +++ b/vendor.conf @@ -38,7 +38,7 @@ github.com/gofrs/flock 7f43ea2e6a643ad441fc12d0ecc0 # libnetwork # When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly -github.com/docker/libnetwork 026aabaa659832804b01754aaadd2c0f420c68b6 # bump_19.03 branch +github.com/docker/libnetwork 55e924b8a84231a065879156c0de95aefc5f5435 # bump_19.03 branch 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 451f760b61..6c8e4caa8a 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 |