diff options
| author | Drew Erny <drew.erny@docker.com> | 2019-12-13 12:16:44 -0600 |
|---|---|---|
| committer | Drew Erny <drew.erny@docker.com> | 2020-01-07 09:43:22 -0600 |
| commit | 07efe6a0a7c8de362fe3fcf5201ae50578b34309 (patch) | |
| tree | e5ce25ab32bbbddd26790269959be0a74f986b7b /integration/network | |
| parent | a9507c6f76627fdc092edc542d5a7ef4a6df5eec (diff) | |
| download | docker-07efe6a0a7c8de362fe3fcf5201ae50578b34309.tar.gz | |
Bump swarmkit to 24fb4cfe8af56803640180c5592bf32da732ced2
Bumps the vendoring of github.com/docker/swarmkit to the above commit,
which is the current master at commit time.
Most notably, this includes a change making the ingress network respect
the default address pool. Because of this change, a change to network
integration tests was needed.
Signed-off-by: Drew Erny <drew.erny@docker.com>
Diffstat (limited to 'integration/network')
| -rw-r--r-- | integration/network/service_test.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/integration/network/service_test.go b/integration/network/service_test.go index a4d54dfc72..8942f7f07a 100644 --- a/integration/network/service_test.go +++ b/integration/network/service_test.go @@ -417,6 +417,16 @@ 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) + // As of docker/swarmkit#2890, the ingress network uses the default address + // pool (whereas before, the subnet for the ingress network was hard-coded. + // This means that the ingress network gets the subnet 20.20.0.0/24, and + // the network we just created gets subnet 20.20.1.0/24. + 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) |