@@ -2,20 +2,28 @@ package cnmallocator

 import (

 	"github.com/moby/moby/v2/daemon/libnetwork/driverapi"

-	"github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/brmanager"

+	"github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge"

 	"github.com/moby/moby/v2/daemon/libnetwork/drivers/host"

-	"github.com/moby/moby/v2/daemon/libnetwork/drivers/ipvlan/ivmanager"

-	"github.com/moby/moby/v2/daemon/libnetwork/drivers/macvlan/mvmanager"

+	"github.com/moby/moby/v2/daemon/libnetwork/drivers/ipvlan"

+	"github.com/moby/moby/v2/daemon/libnetwork/drivers/macvlan"

 	"github.com/moby/moby/v2/daemon/libnetwork/drivers/overlay/ovmanager"

 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"

 )

-var initializers = map[string]func(driverapi.Registerer) error{

+// globalDrivers is a map of network drivers that support cluster-wide

+// definition and require cluster-wide resources allocation (i.e. DataScope == scope.Global).

+var globalDrivers = map[string]func(driverapi.Registerer) error{

 	"overlay": ovmanager.Register,

-	"macvlan": mvmanager.Register,

-	"bridge":  brmanager.Register,

-	"ipvlan":  ivmanager.Register,

-	"host":    host.Register,

+}

+

+// localDrivers is a list of builtin network drivers that support cluster-wide

+// definition (i.e. --scope=swarm on the CLI), but don't need global

+// resources allocations (i.e., DataScope == scope.Local).

+var localDrivers = []string{

+	bridge.NetworkType,

+	host.NetworkType,

+	ipvlan.NetworkType,

+	macvlan.NetworkType,

 }

 // PredefinedNetworks returns the list of predefined network structures

@@ -6,11 +6,19 @@ import (

 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"

 )

-var initializers = map[string]func(driverapi.Registerer) error{

-	"overlay":  ovmanager.Register,

-	"internal": stubManager("internal"),

-	"l2bridge": stubManager("l2bridge"),

-	"nat":      stubManager("nat"),

+// globalDrivers is a map of network drivers that support cluster-wide

+// definition and require cluster-wide resources allocation (i.e. DataScope == scope.Global).

+var globalDrivers = map[string]func(driverapi.Registerer) error{

+	"overlay": ovmanager.Register,

+}

+

+// localDrivers is a list of builtin network drivers that support cluster-wide

+// definition (i.e. --scope=swarm on the CLI), but don't need global

+// resources allocations (i.e., DataScope == scope.Local).

+var localDrivers = []string{

+	"internal",

+	"l2bridge",

+	"nat",

 }

 // PredefinedNetworks returns the list of predefined network structures

@@ -19,9 +27,3 @@ func (*Provider) PredefinedNetworks() []networkallocator.PredefinedNetworkData {

 		{Name: "nat", Driver: "nat"},

 	}

 }

-

-func stubManager(ntype string) func(driverapi.Registerer) error {

-	return func(r driverapi.Registerer) error {

-		return RegisterManager(r, ntype)

-	}

-}

deleted file mode 100644

@@ -1,65 +0,0 @@

-package cnmallocator

-

-import (

-	"context"

-

-	"github.com/moby/moby/v2/daemon/libnetwork/driverapi"

-	"github.com/moby/moby/v2/daemon/libnetwork/scope"

-	"github.com/moby/moby/v2/daemon/libnetwork/types"

-)

-

-type manager struct {

-	networkType string

-}

-

-// RegisterManager registers a new instance of the manager driver for networkType with r.

-func RegisterManager(r driverapi.Registerer, networkType string) error {

-	return r.RegisterDriver(networkType, &manager{networkType: networkType}, driverapi.Capability{

-		DataScope:         scope.Local,

-		ConnectivityScope: scope.Local,

-	})

-}

-

-func (d *manager) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

-	return nil, types.NotImplementedErrorf("not implemented")

-}

-

-func (d *manager) NetworkFree(id string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *manager) CreateNetwork(ctx context.Context, id string, option map[string]any, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *manager) DeleteNetwork(nid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *manager) CreateEndpoint(_ context.Context, nid, eid string, ifInfo driverapi.InterfaceInfo, epOptions map[string]any) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *manager) DeleteEndpoint(nid, eid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *manager) EndpointOperInfo(nid, eid string) (map[string]any, error) {

-	return nil, types.NotImplementedErrorf("not implemented")

-}

-

-func (d *manager) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]any) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *manager) Leave(nid, eid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *manager) Type() string {

-	return d.networkType

-}

-

-func (d *manager) IsBuiltIn() bool {

-	return true

-}

@@ -4,6 +4,7 @@ import (

 	"context"

 	"fmt"

 	"net"

+	"slices"

 	"strings"

 	"github.com/containerd/log"

@@ -80,9 +81,11 @@ type network struct {

 }

 type networkDriver struct {

-	driver     driverapi.Driver

-	name       string

-	capability *driverapi.Capability

+	driver driverapi.Driver // driver is nil when isNodeLocal == true

+	name   string

+	// isNodeLocal indicates whether that driver is locally-managed or requires

+	// global resources allocation.

+	isNodeLocal bool

 }

 // NewAllocator returns a new NetworkAllocator handle

@@ -95,7 +98,7 @@ func (p *Provider) NewAllocator(netConfig *networkallocator.Config) (networkallo

 		pg:       p.pg,

 	}

-	for ntype, i := range initializers {

+	for ntype, i := range globalDrivers {

 		if err := i(&na.networkRegistry); err != nil {

 			return nil, fmt.Errorf("failed to register %q network driver: %w", ntype, err)

 		}

@@ -129,7 +132,7 @@ func (na *cnmNetworkAllocator) Allocate(n *api.Network) error {

 	nw := &network{

 		nw:          n,

 		endpoints:   make(map[string]string),

-		isNodeLocal: d.capability.DataScope == scope.Local,

+		isNodeLocal: d.isNodeLocal,

 	}

 	// No swarm-level allocation can be provided by the network driver for

@@ -149,7 +152,7 @@ func (na *cnmNetworkAllocator) Allocate(n *api.Network) error {

 			return errors.Wrapf(err, "failed allocating pools and gateway IP for network %s", n.ID)

 		}

-		if err := na.allocateDriverState(n); err != nil {

+		if err := na.allocateDriverState(d, n); err != nil {

 			na.freePools(n, nw.pools)

 			return errors.Wrapf(err, "failed while allocating driver state for network %s", n.ID)

 		}

@@ -706,13 +709,16 @@ func (na *cnmNetworkAllocator) freeDriverState(n *api.Network) error {

 		return err

 	}

+	if d.driver == nil {

+		return fmt.Errorf("driver %s was loaded from localDrivers and can't be used to free driver state", d.name)

+	}

+

 	return d.driver.NetworkFree(n.ID)

 }

-func (na *cnmNetworkAllocator) allocateDriverState(n *api.Network) error {

-	d, err := na.resolveDriver(n)

-	if err != nil {

-		return err

+func (na *cnmNetworkAllocator) allocateDriverState(d *networkDriver, n *api.Network) error {

+	if d.driver == nil {

+		return fmt.Errorf("driver %s was loaded from localDrivers and can't be used to allocate driver state", d.name)

 	}

 	options := make(map[string]string)

@@ -776,20 +782,28 @@ func (na *cnmNetworkAllocator) resolveDriver(n *api.Network) (*networkDriver, er

 		dName = n.Spec.DriverConfig.Name

 	}

-	d, drvcap := na.networkRegistry.Driver(dName)

+	if slices.Contains(localDrivers, dName) {

+		return &networkDriver{name: dName, isNodeLocal: true}, nil

+	}

+

+	d, drvCap := na.networkRegistry.Driver(dName)

 	if d == nil {

 		err := na.loadDriver(dName)

 		if err != nil {

 			return nil, err

 		}

-		d, drvcap = na.networkRegistry.Driver(dName)

+		d, drvCap = na.networkRegistry.Driver(dName)

 		if d == nil {

 			return nil, fmt.Errorf("could not resolve network driver %s", dName)

 		}

 	}

-	return &networkDriver{driver: d, capability: &drvcap, name: dName}, nil

+	return &networkDriver{

+		driver:      d,

+		name:        dName,

+		isNodeLocal: drvCap.DataScope == scope.Local,

+	}, nil

 }

 func (na *cnmNetworkAllocator) loadDriver(name string) error {

@@ -966,8 +980,8 @@ func (na *cnmNetworkAllocator) IsVIPOnIngressNetwork(vip *api.Endpoint_VirtualIP

 // IsBuiltInDriver returns whether the passed driver is an internal network driver

 func IsBuiltInDriver(name string) bool {

 	n := strings.ToLower(name)

-	_, ok := initializers[n]

-	return ok

+	_, isGlobal := globalDrivers[n]

+	return isGlobal || slices.Contains(localDrivers, n)

 }

 // setIPAMSerialAlloc sets the ipam allocation method to serial

deleted file mode 100644

@@ -1,65 +0,0 @@

-package brmanager

-

-import (

-	"context"

-

-	"github.com/moby/moby/v2/daemon/libnetwork/driverapi"

-	"github.com/moby/moby/v2/daemon/libnetwork/scope"

-	"github.com/moby/moby/v2/daemon/libnetwork/types"

-)

-

-const networkType = "bridge"

-

-type driver struct{}

-

-// Register registers a new instance of the bridge manager driver with r.

-func Register(r driverapi.Registerer) error {

-	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{

-		DataScope:         scope.Local,

-		ConnectivityScope: scope.Local,

-	})

-}

-

-func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

-	return nil, types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) NetworkFree(id string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) CreateNetwork(ctx context.Context, id string, option map[string]any, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) DeleteNetwork(nid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) CreateEndpoint(_ context.Context, nid, eid string, ifInfo driverapi.InterfaceInfo, epOptions map[string]any) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) DeleteEndpoint(nid, eid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) EndpointOperInfo(nid, eid string) (map[string]any, error) {

-	return nil, types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]any) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) Leave(nid, eid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) Type() string {

-	return networkType

-}

-

-func (d *driver) IsBuiltIn() bool {

-	return true

-}

deleted file mode 100644

@@ -1,65 +0,0 @@

-package ivmanager

-

-import (

-	"context"

-

-	"github.com/moby/moby/v2/daemon/libnetwork/driverapi"

-	"github.com/moby/moby/v2/daemon/libnetwork/scope"

-	"github.com/moby/moby/v2/daemon/libnetwork/types"

-)

-

-const networkType = "ipvlan"

-

-type driver struct{}

-

-// Register registers a new instance of the ipvlan manager driver.

-func Register(r driverapi.Registerer) error {

-	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{

-		DataScope:         scope.Local,

-		ConnectivityScope: scope.Global,

-	})

-}

-

-func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

-	return nil, types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) NetworkFree(id string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) CreateNetwork(ctx context.Context, id string, option map[string]any, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) DeleteNetwork(nid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) CreateEndpoint(_ context.Context, nid, eid string, ifInfo driverapi.InterfaceInfo, epOptions map[string]any) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) DeleteEndpoint(nid, eid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) EndpointOperInfo(nid, eid string) (map[string]any, error) {

-	return nil, types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]any) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) Leave(nid, eid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) Type() string {

-	return networkType

-}

-

-func (d *driver) IsBuiltIn() bool {

-	return true

-}

deleted file mode 100644

@@ -1,65 +0,0 @@

-package mvmanager

-

-import (

-	"context"

-

-	"github.com/moby/moby/v2/daemon/libnetwork/driverapi"

-	"github.com/moby/moby/v2/daemon/libnetwork/scope"

-	"github.com/moby/moby/v2/daemon/libnetwork/types"

-)

-

-const networkType = "macvlan"

-

-type driver struct{}

-

-// Register registers a new instance of the macvlan manager driver.

-func Register(r driverapi.Registerer) error {

-	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{

-		DataScope:         scope.Local,

-		ConnectivityScope: scope.Global,

-	})

-}

-

-func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

-	return nil, types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) NetworkFree(id string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) CreateNetwork(ctx context.Context, id string, option map[string]any, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) DeleteNetwork(nid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) CreateEndpoint(_ context.Context, nid, eid string, ifInfo driverapi.InterfaceInfo, epOptions map[string]any) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) DeleteEndpoint(nid, eid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) EndpointOperInfo(nid, eid string) (map[string]any, error) {

-	return nil, types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]any) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) Leave(nid, eid string) error {

-	return types.NotImplementedErrorf("not implemented")

-}

-

-func (d *driver) Type() string {

-	return networkType

-}

-

-func (d *driver) IsBuiltIn() bool {

-	return true

-}