0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump libnetwork

Browse source 
Signed-off-by: Ameya Gawde <agawde@mirantis.com>
This commit is contained in:
Ameya Gawde 2020-11-17 16:17:09 -08:00
parent 837baebb74
commit f80f6304e2
No known key found for this signature in database
GPG key ID: 35DBDE26A4D2AF6D
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/dockerfile/install/proxy.installer
View file

@ -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

2
vendor.conf
View file

@ -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

7
vendor/github.com/docker/libnetwork/service_linux.go generated vendored
View file

@ -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