Skip to content

Commit e1710b4

Browse files
thaJeztahthaJeztah
committed
vendor: bump libnetwork bf2bd42abc0a3734f12b5ec724e571434e42c669
full diff: moby/libnetwork@264bffc...bf2bd42 relevant changes: - moby/libnetwork#2407 Macvlan internal network should not change default gateway - fixes moby/libnetwork#2406 Internal macvlan network overrides default gateway - vendor godbus/dbus v5 - Fix InhibitIPv4 nil panic - Cleanup VFP during overlay network removal - fixes VFP leak in windows overlay network deletion Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 6004b9a commit e1710b4

43 files changed

Lines changed: 151 additions & 5012 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎hack/dockerfile/install/proxy.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
44
# updating the binary version, consider updating github.com/docker/libnetwork
55
# in vendor.conf accordingly
6-
: "${LIBNETWORK_COMMIT:=264bffcb88c1b6b7471c04e3c6b3f301233a544b}"
6+
: "${LIBNETWORK_COMMIT:=bf2bd42abc0a3734f12b5ec724e571434e42c669}"
77

88
install_proxy() {
99
case "$1" in

‎integration/network/ipvlan/ipvlan_test.go‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"strings"
1010
"sync"
1111
"testing"
12-
"time"
1312

1413
dclient "github.com/docker/docker/client"
1514
"github.com/docker/docker/integration/internal/container"
@@ -172,14 +171,10 @@ func testIpvlanL2InternalMode(client dclient.APIClient) func(*testing.T) {
172171
id1 := container.Run(ctx, t, client, container.WithNetworkMode(netName))
173172
id2 := container.Run(ctx, t, client, container.WithNetworkMode(netName))
174173

175-
timeoutCtx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
176-
defer cancel()
177-
_, err := container.Exec(timeoutCtx, client, id1, []string{"ping", "-c", "1", "-w", "1", "8.8.8.8"})
178-
// FIXME(vdemeester) check the time of error ?
179-
assert.Check(t, err != nil)
180-
assert.Check(t, timeoutCtx.Err() == context.DeadlineExceeded)
174+
result, _ := container.Exec(ctx, client, id1, []string{"ping", "-c", "1", "8.8.8.8"})
175+
assert.Check(t, strings.Contains(result.Combined(), "Network is unreachable"))
181176

182-
_, err = container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})
177+
_, err := container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})
183178
assert.NilError(t, err)
184179
}
185180
}
@@ -230,14 +225,10 @@ func testIpvlanL3InternalMode(client dclient.APIClient) func(*testing.T) {
230225
container.WithIPv4(netName, "172.28.230.10"),
231226
)
232227

233-
timeoutCtx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
234-
defer cancel()
235-
_, err := container.Exec(timeoutCtx, client, id1, []string{"ping", "-c", "1", "-w", "1", "8.8.8.8"})
236-
// FIXME(vdemeester) check the time of error ?
237-
assert.Check(t, err != nil)
238-
assert.Check(t, timeoutCtx.Err() == context.DeadlineExceeded)
228+
result, _ := container.Exec(ctx, client, id1, []string{"ping", "-c", "1", "8.8.8.8"})
229+
assert.Check(t, strings.Contains(result.Combined(), "Network is unreachable"))
239230

240-
_, err = container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})
231+
_, err := container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})
241232
assert.NilError(t, err)
242233
}
243234
}

‎integration/network/macvlan/macvlan_test.go‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"context"
77
"strings"
88
"testing"
9-
"time"
109

1110
"github.com/docker/docker/client"
1211
"github.com/docker/docker/integration/internal/container"
@@ -164,14 +163,10 @@ func testMacvlanInternalMode(client client.APIClient) func(*testing.T) {
164163
id1 := container.Run(ctx, t, client, container.WithNetworkMode(netName))
165164
id2 := container.Run(ctx, t, client, container.WithNetworkMode(netName))
166165

167-
timeoutCtx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
168-
defer cancel()
169-
_, err := container.Exec(timeoutCtx, client, id1, []string{"ping", "-c", "1", "-w", "1", "8.8.8.8"})
170-
// FIXME(vdemeester) check the time of error ?
171-
assert.Check(t, err != nil)
172-
assert.Check(t, timeoutCtx.Err() == context.DeadlineExceeded)
166+
result, _ := container.Exec(ctx, client, id1, []string{"ping", "-c", "1", "8.8.8.8"})
167+
assert.Check(t, strings.Contains(result.Combined(), "Network is unreachable"))
173168

174-
_, err = container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})
169+
_, err := container.Exec(ctx, client, id2, []string{"ping", "-c", "1", id1})
175170
assert.Check(t, err == nil)
176171
}
177172
}

‎vendor.conf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d2
3838
# libnetwork
3939

4040
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
41-
github.com/docker/libnetwork 264bffcb88c1b6b7471c04e3c6b3f301233a544b
41+
github.com/docker/libnetwork bf2bd42abc0a3734f12b5ec724e571434e42c669
4242
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
4343
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
4444
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
@@ -90,8 +90,6 @@ github.com/coreos/go-systemd/v22 2d78030078ef61b3cae27f42ad6d
9090
github.com/godbus/dbus/v5 37bf87eef99d69c4f1d3528bd66e3a87dc201472 # v5.0.3
9191
# go-systemd v17 is required by github.com/coreos/pkg/capnslog/journald_formatter.go
9292
github.com/coreos/go-systemd 39ca1b05acc7ad1220e09f133283b8859a8b71ab # v17
93-
# dbus v4 is needed by libnetwork (until https://github.com/docker/libnetwork/pull/2518 gets merged)
94-
github.com/godbus/dbus 5f6efc7ef2759c81b7ba876593971bfce311eab3 # v4.0.0
9593

9694
# gelf logging driver deps
9795
github.com/Graylog2/go-gelf 1550ee647df0510058c9d67a45c56f18911d80b8 # v2 branch

‎vendor/github.com/docker/libnetwork/drivers/bridge/bridge_store.go‎

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_joinleave.go‎

Lines changed: 61 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_network.go‎

Lines changed: 5 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_joinleave.go‎

Lines changed: 39 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_network.go‎

Lines changed: 6 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/libnetwork/iptables/firewalld.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)