[19.03 backport] Add TC to check dynamic subnet for ingress network
Andrew Hsu authored on 2019/11/06 13:12:14... | ... |
@@ -417,6 +417,12 @@ func TestServiceWithDefaultAddressPoolInit(t *testing.T) { |
417 | 417 |
assert.NilError(t, err) |
418 | 418 |
t.Logf("%s: NetworkInspect: %+v", t.Name(), out) |
419 | 419 |
assert.Assert(t, len(out.IPAM.Config) > 0) |
420 |
+ assert.Equal(t, out.IPAM.Config[0].Subnet, "20.20.1.0/24") |
|
421 |
+ |
|
422 |
+ // Also inspect ingress network and make sure its in the same subnet |
|
423 |
+ out, err = cli.NetworkInspect(ctx, "ingress", types.NetworkInspectOptions{Verbose: true}) |
|
424 |
+ assert.NilError(t, err) |
|
425 |
+ assert.Assert(t, len(out.IPAM.Config) > 0) |
|
420 | 426 |
assert.Equal(t, out.IPAM.Config[0].Subnet, "20.20.0.0/24") |
421 | 427 |
|
422 | 428 |
err = cli.ServiceRemove(ctx, serviceID) |
... | ... |
@@ -128,7 +128,7 @@ github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266 |
128 | 128 |
github.com/gogo/googleapis d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0 |
129 | 129 |
|
130 | 130 |
# cluster |
131 |
-github.com/docker/swarmkit bbe341867eae1615faf8a702ec05bfe986e73e06 # bump_v19.03 branch |
|
131 |
+github.com/docker/swarmkit f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 # bump_v19.03 branch |
|
132 | 132 |
github.com/gogo/protobuf ba06b47c162d49f2af050fb4c75bcbc86a159d5c # v1.2.1 |
133 | 133 |
github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5 # v1.2.0 |
134 | 134 |
github.com/cloudflare/cfssl 5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2 |
... | ... |
@@ -1224,12 +1224,8 @@ func newIngressNetwork() *api.Network { |
1224 | 1224 |
}, |
1225 | 1225 |
DriverConfig: &api.Driver{}, |
1226 | 1226 |
IPAM: &api.IPAMOptions{ |
1227 |
- Driver: &api.Driver{}, |
|
1228 |
- Configs: []*api.IPAMConfig{ |
|
1229 |
- { |
|
1230 |
- Subnet: "10.255.0.0/16", |
|
1231 |
- }, |
|
1232 |
- }, |
|
1227 |
+ Driver: &api.Driver{}, |
|
1228 |
+ Configs: []*api.IPAMConfig{}, |
|
1233 | 1229 |
}, |
1234 | 1230 |
}, |
1235 | 1231 |
} |