From 2d690d4e875eeff919c03bab41a410e9c56a216f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 6 Mar 2018 14:18:48 +0100 Subject: [PATCH 1/2] Engine: bump swarmkit to 11d7b06f48bc1d73fc6d8776c3552a4b11c94301 Ingress network should not be attachable Ingress network is a special network used only to expose ports. For this reason the network cannot be explicitly attached during service create or service update Signed-off-by: Sebastiaan van Stijn --- components/engine/vendor.conf | 2 +- .../docker/swarmkit/manager/controlapi/service.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index bf1e9a6ccd..d8513f5bd4 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -120,7 +120,7 @@ github.com/dmcgowan/go-tar go1.10 github.com/stevvooe/ttrpc d4528379866b0ce7e9d71f3eb96f0582fc374577 # cluster -github.com/docker/swarmkit 49a9d7f6ba3c1925262641e694c18eb43575f74b +github.com/docker/swarmkit 11d7b06f48bc1d73fc6d8776c3552a4b11c94301 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/controlapi/service.go b/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/service.go index e4c27df977..3912052bf0 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/service.go +++ b/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/service.go @@ -644,7 +644,7 @@ func (s *Server) CreateService(ctx context.Context, request *api.CreateServiceRe return nil, err } - if err := s.validateNetworks(request.Spec.Networks); err != nil { + if err := s.validateNetworks(request.Spec.Task.Networks); err != nil { return nil, err } @@ -727,6 +727,10 @@ func (s *Server) UpdateService(ctx context.Context, request *api.UpdateServiceRe return nil, err } + if err := s.validateNetworks(request.Spec.Task.Networks); err != nil { + return nil, err + } + var service *api.Service s.store.View(func(tx store.ReadTx) { service = store.GetService(tx, request.ServiceID) From dbe2a19e83b9bbeaac7822fb4a489981a2d042b3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 6 Mar 2018 14:21:01 +0100 Subject: [PATCH 2/2] CLI bump swarmkit to 11d7b06f48bc1d73fc6d8776c3552a4b11c94301 Contains no changes for the CLI, but keeps the version in sync with engine Signed-off-by: Sebastiaan van Stijn --- components/cli/vendor.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cli/vendor.conf b/components/cli/vendor.conf index 542efca9f0..cd9c2b49fd 100755 --- a/components/cli/vendor.conf +++ b/components/cli/vendor.conf @@ -13,7 +13,7 @@ github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06 github.com/docker/go-connections 7beb39f0b969b075d1325fecb092faf27fd357b6 github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9 github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1 -github.com/docker/swarmkit 49a9d7f6ba3c1925262641e694c18eb43575f74b +github.com/docker/swarmkit 11d7b06f48bc1d73fc6d8776c3552a4b11c94301 github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46 github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6 github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff