Procházet zdrojové kódy

Revert "Fixed a few network UI issues in swarm-mode"

This reverts commit 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Madhu Venugopal před 9 roky
rodič
revize
4623276886
2 změnil soubory, kde provedl 0 přidání a 14 odebrání
  1. 0 4
      api/server/router/network/network_routes.go
  2. 0 10
      daemon/network.go

+ 0 - 4
api/server/router/network/network_routes.go

@@ -81,10 +81,6 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr
 		return err
 		return err
 	}
 	}
 
 
-	if _, err := n.clusterProvider.GetNetwork(create.Name); err == nil {
-		return libnetwork.NetworkNameError(create.Name)
-	}
-
 	nw, err := n.backend.CreateNetwork(create)
 	nw, err := n.backend.CreateNetwork(create)
 	if err != nil {
 	if err != nil {
 		if _, ok := err.(libnetwork.ManagerRedirectError); !ok {
 		if _, ok := err.(libnetwork.ManagerRedirectError); !ok {

+ 0 - 10
daemon/network.go

@@ -292,10 +292,6 @@ func (daemon *Daemon) UpdateContainerServiceConfig(containerName string, service
 	return nil
 	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
 // ConnectContainerToNetwork connects the given container to the given
 // network. If either cannot be found, an err is returned. If the
 // network. If either cannot be found, an err is returned. If the
 // network cannot be set up, an err is returned.
 // network cannot be set up, an err is returned.
@@ -304,9 +300,6 @@ func (daemon *Daemon) ConnectContainerToNetwork(containerName, networkName strin
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
-	if container.Managed {
-		return errClusterNetworkConnect()
-	}
 	return daemon.ConnectToNetwork(container, networkName, endpointConfig)
 	return daemon.ConnectToNetwork(container, networkName, endpointConfig)
 }
 }
 
 
@@ -320,9 +313,6 @@ func (daemon *Daemon) DisconnectContainerFromNetwork(containerName string, netwo
 		}
 		}
 		return err
 		return err
 	}
 	}
-	if container.Managed {
-		return errClusterNetworkConnect()
-	}
 	return daemon.DisconnectFromNetwork(container, network, force)
 	return daemon.DisconnectFromNetwork(container, network, force)
 }
 }