From 6ff576e8cac0f6e3f22fe881dd443e68fcd6ac5c Mon Sep 17 00:00:00 2001 From: Cory Snider Date: Tue, 25 Apr 2023 12:13:17 -0400 Subject: vendor: github.com/docker/libnetwork 3f0048413d95802b9c6c836eba06bfc54f9dbd03 full diff: https://github.com/moby/libnetwork/compare/05b93e0d3a95952f70c113b0bc5bdb538d7afdd7...3f0048413d95802b9c6c836eba06bfc54f9dbd03 Signed-off-by: Cory Snider --- hack/dockerfile/install/proxy.installer | 2 +- vendor.conf | 2 +- vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go | 2 +- vendor/github.com/docker/libnetwork/drivers/windows/windows.go | 2 +- vendor/github.com/docker/libnetwork/network.go | 3 --- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hack/dockerfile/install/proxy.installer b/hack/dockerfile/install/proxy.installer index b851a930a8..9c1d2190a0 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:=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7}" +: "${LIBNETWORK_COMMIT:=3f0048413d95802b9c6c836eba06bfc54f9dbd03}" install_proxy() { case "$1" in diff --git a/vendor.conf b/vendor.conf index c2e25871df..04ac7581af 100644 --- a/vendor.conf +++ b/vendor.conf @@ -48,7 +48,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 c5aa85f9b25f0acaec8591ced679cb9fb5b9e32c +github.com/docker/libnetwork 3f0048413d95802b9c6c836eba06bfc54f9dbd03 github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 github.com/armon/go-metrics f0300d1749da6fa982027e449ec0c7a145510c3c # v0.4.1 diff --git a/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go b/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go index da1e8c8100..7b19793dcf 100644 --- a/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go +++ b/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go @@ -318,7 +318,7 @@ func (n *network) joinSandbox(s *subnet, restore bool, incJoinCount bool) error defer func() { n.Unlock() if doInitPeerDB { - n.driver.initSandboxPeerDB(n.id) + go n.driver.initSandboxPeerDB(n.id) } }() diff --git a/vendor/github.com/docker/libnetwork/drivers/windows/windows.go b/vendor/github.com/docker/libnetwork/drivers/windows/windows.go index 0806f783ac..9ef6360989 100644 --- a/vendor/github.com/docker/libnetwork/drivers/windows/windows.go +++ b/vendor/github.com/docker/libnetwork/drivers/windows/windows.go @@ -685,8 +685,8 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, } if n.driver.name == "nat" && !epOption.DisableDNS { - logrus.Debugf("endpointStruct.EnableInternalDNS =[%v]", endpointStruct.EnableInternalDNS) endpointStruct.EnableInternalDNS = true + logrus.Debugf("endpointStruct.EnableInternalDNS =[%v]", endpointStruct.EnableInternalDNS) } endpointStruct.DisableICC = epOption.DisableICC diff --git a/vendor/github.com/docker/libnetwork/network.go b/vendor/github.com/docker/libnetwork/network.go index 734bb83cdd..7895ea53b1 100644 --- a/vendor/github.com/docker/libnetwork/network.go +++ b/vendor/github.com/docker/libnetwork/network.go @@ -1064,9 +1064,6 @@ func (n *network) delete(force bool, rmLBEndpoint bool) error { } n.ipamRelease() - if err = c.updateToStore(n); err != nil { - logrus.Warnf("Failed to update store after ipam release for network %s (%s): %v", n.Name(), n.ID(), err) - } // We are about to delete the network. Leave the gossip // cluster for the network to stop all incoming network -- cgit v1.2.1