From 4d0dd06af3dd5a160c50026a45a32ce4e26ec36d Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 10 Oct 2019 15:40:58 -0700 Subject: [PATCH] Bump Swarmkit to b0bc4017ad110cd20898d8c44be03c1e78e4e979 1. Includes: https://github.com/docker/swarmkit/pull/2892 2. Edited TestServiceWithDefaultAddressPoolInit to validate dynamic ingress network subnet Signed-off-by: Arko Dasgupta --- integration/network/service_test.go | 6 ++++++ vendor.conf | 2 +- vendor/github.com/docker/swarmkit/manager/manager.go | 8 ++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/integration/network/service_test.go b/integration/network/service_test.go index 9a207125b98fd..7311ef4bf424a 100644 --- a/integration/network/service_test.go +++ b/integration/network/service_test.go @@ -363,6 +363,12 @@ func TestServiceWithDefaultAddressPoolInit(t *testing.T) { assert.NilError(t, err) t.Logf("%s: NetworkInspect: %+v", t.Name(), out) assert.Assert(t, len(out.IPAM.Config) > 0) + assert.Equal(t, out.IPAM.Config[0].Subnet, "20.20.1.0/24") + + // Also inspect ingress network and make sure its in the same subnet + out, err = cli.NetworkInspect(ctx, "ingress", types.NetworkInspectOptions{Verbose: true}) + assert.NilError(t, err) + assert.Assert(t, len(out.IPAM.Config) > 0) assert.Equal(t, out.IPAM.Config[0].Subnet, "20.20.0.0/24") err = cli.ServiceRemove(context.Background(), serviceID) diff --git a/vendor.conf b/vendor.conf index 165cc5c42be6f..02573103695c1 100644 --- a/vendor.conf +++ b/vendor.conf @@ -130,7 +130,7 @@ github.com/containerd/ttrpc 2a805f71863501300ae1976d29f0454ae003e85a github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef # cluster -github.com/docker/swarmkit 142a73731c850daf24d32001aa2358b6ffe36eab # bump_v18.09 branch +github.com/docker/swarmkit b0bc4017ad110cd20898d8c44be03c1e78e4e979 # bump_v18.09 branch github.com/gogo/protobuf v1.0.0 github.com/cloudflare/cfssl 1.3.2 github.com/fernet/fernet-go 1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2 diff --git a/vendor/github.com/docker/swarmkit/manager/manager.go b/vendor/github.com/docker/swarmkit/manager/manager.go index 08b158db441c9..90b2815d6852e 100644 --- a/vendor/github.com/docker/swarmkit/manager/manager.go +++ b/vendor/github.com/docker/swarmkit/manager/manager.go @@ -1202,12 +1202,8 @@ func newIngressNetwork() *api.Network { }, DriverConfig: &api.Driver{}, IPAM: &api.IPAMOptions{ - Driver: &api.Driver{}, - Configs: []*api.IPAMConfig{ - { - Subnet: "10.255.0.0/16", - }, - }, + Driver: &api.Driver{}, + Configs: []*api.IPAMConfig{}, }, }, }