Browse code

Merge pull request #36003 from pradipd/upgrade_fix

Fixing ingress network when upgrading from 17.09 to 17.12.

Brian Goff authored on 2018/01/20 05:46:50
Showing 1 changed files
... ...
@@ -146,6 +146,11 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error {
146 146
 		attachments[na.Network.ID] = na.Addresses[0]
147 147
 	}
148 148
 
149
+	if (ingressNA == nil) && (node.Attachment != nil) {
150
+		ingressNA = node.Attachment
151
+		attachments[ingressNA.Network.ID] = ingressNA.Addresses[0]
152
+	}
153
+
149 154
 	if ingressNA == nil {
150 155
 		e.backend.ReleaseIngress()
151 156
 		return e.backend.GetAttachmentStore().ResetAttachments(attachments)