From bd0030199474826978476b5b67eec450c3f329a3 Mon Sep 17 00:00:00 2001 From: jose-bigio Date: Mon, 18 Dec 2017 15:33:00 -0800 Subject: [PATCH] bump vndr of swarmkit to 2e6f892 Signed-off-by: jose-bigio --- components/engine/vendor.conf | 2 +- .../manager/allocator/cnmallocator/networkallocator.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index f59f9cf1439..4bfacf33bfc 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -114,7 +114,7 @@ github.com/dmcgowan/go-tar go1.10 github.com/stevvooe/ttrpc 76e68349ad9ab4d03d764c713826d31216715e4f # cluster -github.com/docker/swarmkit 4429c763170d9ca96929249353c3270c19e7d39e +github.com/docker/swarmkit 2e6f892e2def5835420c043420f7294dd28012a6 github.com/gogo/protobuf v0.4 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e diff --git a/components/engine/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go b/components/engine/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go index 53f9ffbeee6..b89e72ed6e8 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go +++ b/components/engine/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go @@ -404,6 +404,11 @@ func (na *cnmNetworkAllocator) IsServiceAllocated(s *api.Service, flags ...func( vipLoop: for _, vip := range s.Endpoint.VirtualIPs { if na.IsVIPOnIngressNetwork(vip) && networkallocator.IsIngressNetworkNeeded(s) { + // This checks the condition when ingress network is needed + // but allocation has not been done. + if _, ok := na.services[s.ID]; !ok { + return false + } continue vipLoop } for _, net := range specNetworks {