Fix possible overlapping IPs when ingressNA == nil

corhere · corhere · commit 56ad94156468 · 2025-05-09T12:51:08.000-04:00
Logic was added to the Swarm executor in commit 0d9b0ed to clean up managed networks whenever the node's load-balancer IP address is removed or changed in order to free up the address in the case where the container fails to start entirely. Unfortunately, due to an oversight the function returns early if the Swarm is lacking an ingress network. Remove the early return so that load-balancer IP addresses for all the other networks are freed as appropriate, irrespective of whether an ingress network exists in the Swarm. Signed-off-by: Cory Snider <csnider@mirantis.com>
diff --git a/daemon/cluster/executor/container/executor.go b/daemon/cluster/executor/container/executor.go
@@ -213,36 +213,35 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error {
 
 	if ingressNA == nil {
 		e.backend.ReleaseIngress()
-		return e.backend.GetAttachmentStore().ResetAttachments(attachments)
-	}
-
-	options := network.CreateOptions{
-		Driver: ingressNA.Network.DriverState.Name,
-		IPAM: &network.IPAM{
-			Driver: ingressNA.Network.IPAM.Driver.Name,
-		},
-		Options: ingressNA.Network.DriverState.Options,
-		Ingress: true,
-	}
+	} else {
+		options := network.CreateOptions{
+			Driver: ingressNA.Network.DriverState.Name,
+			IPAM: &network.IPAM{
+				Driver: ingressNA.Network.IPAM.Driver.Name,
+			},
+			Options: ingressNA.Network.DriverState.Options,
+			Ingress: true,
+		}
 
-	for _, ic := range ingressNA.Network.IPAM.Configs {
-		c := network.IPAMConfig{
-			Subnet:  ic.Subnet,
-			IPRange: ic.Range,
-			Gateway: ic.Gateway,
+		for _, ic := range ingressNA.Network.IPAM.Configs {
+			c := network.IPAMConfig{
+				Subnet:  ic.Subnet,
+				IPRange: ic.Range,
+				Gateway: ic.Gateway,
+			}
+			options.IPAM.Config = append(options.IPAM.Config, c)
 		}
-		options.IPAM.Config = append(options.IPAM.Config, c)
-	}
 
-	_, err := e.backend.SetupIngress(clustertypes.NetworkCreateRequest{
-		ID: ingressNA.Network.ID,
-		CreateRequest: network.CreateRequest{
-			Name:          ingressNA.Network.Spec.Annotations.Name,
-			CreateOptions: options,
-		},
-	}, ingressNA.Addresses[0])
-	if err != nil {
-		return err
+		_, err := e.backend.SetupIngress(clustertypes.NetworkCreateRequest{
+			ID: ingressNA.Network.ID,
+			CreateRequest: network.CreateRequest{
+				Name:          ingressNA.Network.Spec.Annotations.Name,
+				CreateOptions: options,
+			},
+		}, ingressNA.Addresses[0])
+		if err != nil {
+			return err
+		}
 	}
 
 	var (
