Merge pull request #24431 from mavenugo/revert

Check for swarm-mode network conflict during create network
Upstream-commit: e10c11e4a1ac39a408f7503b594207e481387c87
Component: engine

components/engine/daemon/network.go

@@ -292,10 +292,6 @@ func (daemon *Daemon) UpdateContainerServiceConfig(containerName string, service
 	return nil
 }
 
-func errClusterNetworkConnect() error {
-	return fmt.Errorf("cannot connect or disconnect managed containers on a network")
-}
-
 // ConnectContainerToNetwork connects the given container to the given
 // network. If either cannot be found, an err is returned. If the
 // network cannot be set up, an err is returned.
@@ -304,9 +300,6 @@ func (daemon *Daemon) ConnectContainerToNetwork(containerName, networkName strin
 	if err != nil {
 		return err
 	}
-	if container.Managed {
-		return errClusterNetworkConnect()
-	}
 	return daemon.ConnectToNetwork(container, networkName, endpointConfig)
 }
 
@@ -320,9 +313,6 @@ func (daemon *Daemon) DisconnectContainerFromNetwork(containerName string, netwo
 		}
 		return err
 	}
-	if container.Managed {
-		return errClusterNetworkConnect()
-	}
 	return daemon.DisconnectFromNetwork(container, network, force)
 }