From 0986b8a32cc6b2bd58db02176d6037e055d23619 Mon Sep 17 00:00:00 2001 From: Pradip Dhara Date: Fri, 12 Jan 2018 09:27:30 +0000 Subject: [PATCH] Fixing ingress network when upgrading from 17.09 to 17.12. Signed-off-by: Pradip Dhara Signed-off-by: Pradip Dhara Upstream-commit: 2d7a50e5855ad0571e76d29cd1ab9f8f3a48433b Component: engine --- .../engine/daemon/cluster/executor/container/executor.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/engine/daemon/cluster/executor/container/executor.go b/components/engine/daemon/cluster/executor/container/executor.go index 14e41fa837..b032163f95 100644 --- a/components/engine/daemon/cluster/executor/container/executor.go +++ b/components/engine/daemon/cluster/executor/container/executor.go @@ -146,6 +146,11 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error { attachments[na.Network.ID] = na.Addresses[0] } + if (ingressNA == nil) && (node.Attachment != nil) { + ingressNA = node.Attachment + attachments[ingressNA.Network.ID] = ingressNA.Addresses[0] + } + if ingressNA == nil { e.backend.ReleaseIngress() return e.backend.GetAttachmentStore().ResetAttachments(attachments)