Browse code

Merge pull request #41685 from ameyag/19.03-bmp-libnetwork-nil-deference

[19.03] docker/libnetwork 55e924b8a84231a065879156c0de95aefc5f5435 (bump_19.03 branch)

Brian Goff authored on 2020/11/19 03:03:17
Showing 3 changed files
... ...
@@ -3,7 +3,7 @@
3 3
 # LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
4 4
 # updating the binary version, consider updating github.com/docker/libnetwork
5 5
 # in vendor.conf accordingly
6
-: ${LIBNETWORK_COMMIT:=026aabaa659832804b01754aaadd2c0f420c68b6} # bump_19.03 branch
6
+: ${LIBNETWORK_COMMIT:=55e924b8a84231a065879156c0de95aefc5f5435} # bump_19.03 branch
7 7
 
8 8
 install_proxy() {
9 9
 	case "$1" in
... ...
@@ -38,7 +38,7 @@ github.com/gofrs/flock                              7f43ea2e6a643ad441fc12d0ecc0
38 38
 # libnetwork
39 39
 
40 40
 # When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
41
-github.com/docker/libnetwork                        026aabaa659832804b01754aaadd2c0f420c68b6 # bump_19.03 branch
41
+github.com/docker/libnetwork                        55e924b8a84231a065879156c0de95aefc5f5435 # bump_19.03 branch
42 42
 github.com/docker/go-events                         e31b211e4f1cd09aa76fe4ac244571fab96ae47f
43 43
 github.com/armon/go-radix                           e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
44 44
 github.com/armon/go-metrics                         eb0af217e5e9747e41dd5303755356b62d28e3ec
... ...
@@ -67,11 +67,12 @@ func (n *network) findLBEndpointSandbox() (*endpoint, *sandbox, error) {
67 67
 	if !ok {
68 68
 		return nil, nil, fmt.Errorf("Unable to get sandbox for %s(%s) in for %s", ep.Name(), ep.ID(), n.ID())
69 69
 	}
70
-	ep = sb.getEndpoint(ep.ID())
71
-	if ep == nil {
70
+	var sep *endpoint
71
+	sep = sb.getEndpoint(ep.ID())
72
+	if sep == nil {
72 73
 		return nil, nil, fmt.Errorf("Load balancing endpoint %s(%s) removed from %s", ep.Name(), ep.ID(), n.ID())
73 74
 	}
74
-	return ep, sb, nil
75
+	return sep, sb, nil
75 76
 }
76 77
 
77 78
 // Searches the OS sandbox for the name of the endpoint interface