ソースを参照

Fixing ingress network when upgrading from 17.09 to 17.12.

Signed-off-by: Pradip Dhara <pradipd@microsoft.com>

Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
Pradip Dhara 7 年 前
コミット
2d7a50e585
1 ファイル変更5 行追加0 行削除
  1. 5 0
      daemon/cluster/executor/container/executor.go

+ 5 - 0
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]
 		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 {
 	if ingressNA == nil {
 		e.backend.ReleaseIngress()
 		e.backend.ReleaseIngress()
 		return e.backend.GetAttachmentStore().ResetAttachments(attachments)
 		return e.backend.GetAttachmentStore().ResetAttachments(attachments)