diff options
| -rw-r--r-- | integration/network/service_test.go | 6 | ||||
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | 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 df2404c372..e6d417b0c9 100644 --- a/integration/network/service_test.go +++ b/integration/network/service_test.go @@ -417,6 +417,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(ctx, serviceID) diff --git a/vendor.conf b/vendor.conf index a576405ba9..4882b3779d 100644 --- a/vendor.conf +++ b/vendor.conf @@ -128,7 +128,7 @@ github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266 github.com/gogo/googleapis d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0 # cluster -github.com/docker/swarmkit bbe341867eae1615faf8a702ec05bfe986e73e06 # bump_v19.03 branch +github.com/docker/swarmkit f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 # bump_v19.03 branch github.com/gogo/protobuf ba06b47c162d49f2af050fb4c75bcbc86a159d5c # v1.2.1 github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5 # v1.2.0 github.com/cloudflare/cfssl 5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2 diff --git a/vendor/github.com/docker/swarmkit/manager/manager.go b/vendor/github.com/docker/swarmkit/manager/manager.go index 9112fb2b40..cba72c232f 100644 --- a/vendor/github.com/docker/swarmkit/manager/manager.go +++ b/vendor/github.com/docker/swarmkit/manager/manager.go @@ -1224,12 +1224,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{}, }, }, } |