From 0c38d56a6dae8c9c8379d29083b759005308ebc9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 2 Oct 2019 23:20:31 +0200 Subject: [PATCH 1/2] Revert "Revert "[19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29"" This reverts commit ef4366ee890abc587b291f7e41223a2c51e14153. Signed-off-by: Sebastiaan van Stijn --- vendor.conf | 2 +- vendor/github.com/docker/swarmkit/manager/manager.go | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/vendor.conf b/vendor.conf index 3c05d45bd92e6..fd6ef4b131b8e 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 9112fb2b40df1..cba72c232f25c 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{}, }, }, } From 12e7d99439917b44a173e5326798365870bbbc90 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 19 Sep 2019 18:12:59 -0700 Subject: [PATCH 2/2] Add TC to check dyanmic subnet for ingress network Signed-off-by: Arko Dasgupta (cherry picked from commit e2b5ac75a393f6942c37efdd888fc3bc761de244) Signed-off-by: Sebastiaan van Stijn --- integration/network/service_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/integration/network/service_test.go b/integration/network/service_test.go index df2404c372cf7..e6d417b0c91cd 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)