From 79b2b252abdc5df5e3d9f23f91355f81e1bffacf Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 19 Sep 2019 09:21:46 +0200 Subject: [PATCH] [19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 full diff: https://github.com/docker/swarmkit/compare/bbe341867eae1615faf8a702ec05bfe986e73e06...f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 changes included: - docker/swarmkit#2891 [19.03 backport] Remove hardcoded IPAM config subnet value for ingress network - backport of docker/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network - fixes [ENGORC-2651] Specifying --default-addr-pool for docker swarm init is not picked up by ingress network Signed-off-by: Sebastiaan van Stijn Upstream-commit: 02465c9f9da4064211d0f7e56a8c93a567589713 Component: engine --- components/engine/vendor.conf | 2 +- .../vendor/github.com/docker/swarmkit/manager/manager.go | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index 50c889a648d..55fec10725c 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -131,7 +131,7 @@ github.com/containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce 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/cloudflare/cfssl 5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2 github.com/fernet/fernet-go 1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2 diff --git a/components/engine/vendor/github.com/docker/swarmkit/manager/manager.go b/components/engine/vendor/github.com/docker/swarmkit/manager/manager.go index 9112fb2b40d..cba72c232f2 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/manager.go +++ b/components/engine/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{}, }, }, }