Signed-off-by: Ameya Gawde <agawde@mirantis.com>
| ... | ... |
@@ -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:=d511c60c5c23e6753631244f271a1ec6097254a5}"
|
|
| 6 |
+: "${LIBNETWORK_COMMIT:=6b51d028f4bbb9a4cc8d3eaba13baa9f848af546}"
|
|
| 7 | 7 |
|
| 8 | 8 |
install_proxy() {
|
| 9 | 9 |
case "$1" in |
| ... | ... |
@@ -47,7 +47,7 @@ github.com/grpc-ecosystem/go-grpc-middleware 3c51f7f332123e8be5a157c0802a |
| 47 | 47 |
# libnetwork |
| 48 | 48 |
|
| 49 | 49 |
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly |
| 50 |
-github.com/docker/libnetwork d511c60c5c23e6753631244f271a1ec6097254a5 |
|
| 50 |
+github.com/docker/libnetwork 6b51d028f4bbb9a4cc8d3eaba13baa9f848af546 |
|
| 51 | 51 |
github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f |
| 52 | 52 |
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 |
| 53 | 53 |
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 |