Browse code

Merge pull request #369 from thaJeztah/19.03_bump_swarmkit

[19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29

Andrew Hsu authored on 2019/09/20 09:48:36
Showing 2 changed files
... ...
@@ -131,7 +131,7 @@ github.com/containerd/ttrpc                         699c4e40d1e7416e08bf7019c7ce
131 131
 github.com/gogo/googleapis                          d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0
132 132
 
133 133
 # cluster
134
-github.com/docker/swarmkit                          bbe341867eae1615faf8a702ec05bfe986e73e06 # bump_v19.03 branch
134
+github.com/docker/swarmkit                          f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 # bump_v19.03 branch
135 135
 github.com/gogo/protobuf                            ba06b47c162d49f2af050fb4c75bcbc86a159d5c # v1.2.1
136 136
 github.com/cloudflare/cfssl                         5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2
137 137
 github.com/fernet/fernet-go                         1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2
... ...
@@ -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
 	}