dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-05 07:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50866 from akerouanton/remove-dummy-manager-netdrivers

Browse Source 
libnet/drivers: rm dummy '*manager' drivers
This commit is contained in:
Sebastiaan van Stijn
2025-09-02 23:22:56 +02:00
committed by GitHub
parent 2edfe3768f 4d2a293ff3
commit 44a5c7556e
26 changed files with 162 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
daemon/libnetwork/cnmallocator/drivers_darwin.go
View File

@@ -1,16 +0,0 @@
package cnmallocator
import (
"github.com/moby/moby/v2/daemon/libnetwork/driverapi"
"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{
"overlay": ovmanager.Register,
}
// PredefinedNetworks returns the list of predefined network structures
func (*Provider) PredefinedNetworks() []networkallocator.PredefinedNetworkData {
return nil
}

24
daemon/libnetwork/cnmallocator/drivers_network_linux.go
View File

@@ -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

24
daemon/libnetwork/cnmallocator/drivers_network_windows.go
View File

@@ -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)
}
}

15
daemon/libnetwork/cnmallocator/drivers_unsupported.go
View File

@@ -1,15 +0,0 @@
//go:build !linux && !darwin && !windows
// +build !linux,!darwin,!windows
package cnmallocator
import (
"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"
)
const initializers = nil
// PredefinedNetworks returns the list of predefined network structures
func (*Provider) PredefinedNetworks() []networkallocator.PredefinedNetworkData {
return nil
}

65
daemon/libnetwork/cnmallocator/manager.go
View File

@@ -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
}

64
daemon/libnetwork/cnmallocator/networkallocator.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"fmt"
"net"
"slices"
"strings"
"github.com/containerd/log"
@@ -14,7 +15,6 @@ import (
"github.com/moby/moby/v2/daemon/libnetwork/ipams/defaultipam"
remoteipam "github.com/moby/moby/v2/daemon/libnetwork/ipams/remote"
"github.com/moby/moby/v2/daemon/libnetwork/netlabel"
"github.com/moby/moby/v2/daemon/libnetwork/scope"
"github.com/moby/moby/v2/pkg/plugingetter"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"
@@ -80,9 +80,11 @@ type network struct {
}
type networkDriver struct {
driver driverapi.Driver
name string
capability *driverapi.Capability
driver driverapi.NetworkAllocator // 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 +97,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 +131,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 +151,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 +708,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 +781,29 @@ func (na *cnmNetworkAllocator) resolveDriver(n *api.Network) (*networkDriver, er
dName = n.Spec.DriverConfig.Name
}
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)
if d == nil {
return nil, fmt.Errorf("could not resolve network driver %s", dName)
}
if slices.Contains(localDrivers, dName) {
return &networkDriver{name: dName, isNodeLocal: true}, nil
}
return &networkDriver{driver: d, capability: &drvcap, name: dName}, nil
if na.networkRegistry.HasDriverOrNwAllocator(dName) {
if nwAlloc := na.networkRegistry.NetworkAllocator(dName); nwAlloc != nil {
return &networkDriver{driver: nwAlloc, name: dName}, nil
}
return &networkDriver{name: dName, isNodeLocal: true}, nil
}
if err := na.loadDriver(dName); err != nil {
return nil, err
}
if na.networkRegistry.HasDriverOrNwAllocator(dName) {
if nwAlloc := na.networkRegistry.NetworkAllocator(dName); nwAlloc != nil {
return &networkDriver{driver: nwAlloc, name: dName}, nil
}
return &networkDriver{name: dName, isNodeLocal: true}, nil
}
return nil, fmt.Errorf("network driver %s not found", dName)
}
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

4
daemon/libnetwork/controller.go
View File

@@ -512,6 +512,10 @@ func (c *Controller) RegisterDriver(networkType string, driver driverapi.Driver,
return nil
}
func (c *Controller) RegisterNetworkAllocator(_ string, _ driverapi.NetworkAllocator) error {
return nil
}
// XXX This should be made driver agnostic. See comment below.
const overlayDSROptionString = "dsr"

28
daemon/libnetwork/driverapi/driverapi.go
View File

@@ -13,16 +13,6 @@ const NetworkPluginEndpointType = "NetworkDriver"
// Driver is an interface that every plugin driver needs to implement.
type Driver interface {
// NetworkAllocate invokes the driver method to allocate network
// specific resources passing network id and network specific config.
// It returns a key,value pair of network specific driver allocations
// to the caller.
NetworkAllocate(nid string, options map[string]string, ipV4Data, ipV6Data []IPAMData) (map[string]string, error)
// NetworkFree invokes the driver method to free network specific resources
// associated with a given network id.
NetworkFree(nid string) error
// CreateNetwork invokes the driver method to create a network
// passing the network id and network specific config. The
// config mechanism will eventually be replaced with labels
@@ -64,6 +54,23 @@ type Driver interface {
IsBuiltIn() bool
}
// NetworkAllocator is a special kind of network driver used by cnmallocator to
// allocate resources inside a Swarm cluster.
type NetworkAllocator interface {
// NetworkAllocate invokes the driver method to allocate network
// specific resources passing network id and network specific config.
// It returns a key,value pair of network specific driver allocations
// to the caller.
NetworkAllocate(nid string, options map[string]string, ipV4Data, ipV6Data []IPAMData) (map[string]string, error)
// NetworkFree invokes the driver method to free network specific resources
// associated with a given network id.
NetworkFree(nid string) error
// IsBuiltIn returns true if it is a built-in driver
IsBuiltIn() bool
}
// TableWatcher is an optional interface for a network driver.
type TableWatcher interface {
// EventNotify notifies the driver when a CRUD operation has
@@ -187,6 +194,7 @@ type JoinInfo interface {
// Registerer provides a way for network drivers to be dynamically registered.
type Registerer interface {
RegisterDriver(name string, driver Driver, capability Capability) error
RegisterNetworkAllocator(name string, driver NetworkAllocator) error
}
// Capability represents the high level capabilities of the drivers which libnetwork can make use of

8
daemon/libnetwork/drivers/bridge/bridge_linux.go
View File

@@ -689,14 +689,6 @@ func (d *driver) getNetworks() []*bridgeNetwork {
return ls
}
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) GetSkipGwAlloc(opts options.Generic) (ipv4, ipv6 bool, _ error) {
// The network doesn't exist yet, so use a dummy id that's long enough to be
// truncated to a short-id (12 characters) and used in the bridge device name.

65
daemon/libnetwork/drivers/bridge/brmanager/brmanager.go
View File

@@ -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
}

8
daemon/libnetwork/drivers/host/host.go
View File

@@ -23,14 +23,6 @@ func Register(r driverapi.Registerer) error {
})
}
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 {
d.Lock()
defer d.Unlock()

9
daemon/libnetwork/drivers/ipvlan/ipvlan.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/moby/moby/v2/daemon/libnetwork/datastore"
"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 (
@@ -76,14 +75,6 @@ func Register(r driverapi.Registerer, store *datastore.Store, config map[string]
})
}
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) EndpointOperInfo(nid, eid string) (map[string]any, error) {
return make(map[string]any), nil
}

5
daemon/libnetwork/drivers/ipvlan/ipvlan_test.go
View File

@@ -31,6 +31,11 @@ func (dt *driverTester) RegisterDriver(name string, drv driverapi.Driver, capabi
return nil
}
func (dt *driverTester) RegisterNetworkAllocator(name string, _ driverapi.NetworkAllocator) error {
dt.t.Fatalf("Unexpected call to RegisterNetworkAllocator for %q", name)
return nil
}
func TestIpvlanRegister(t *testing.T) {
if err := Register(&driverTester{t: t}, storeutils.NewTempStore(t), nil); err != nil {
t.Fatal(err)

65
daemon/libnetwork/drivers/ipvlan/ivmanager/ivmanager.go
View File

@@ -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
}

9
daemon/libnetwork/drivers/macvlan/macvlan.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/moby/moby/v2/daemon/libnetwork/datastore"
"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 (
@@ -70,14 +69,6 @@ func Register(r driverapi.Registerer, store *datastore.Store, _ map[string]any)
})
}
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) EndpointOperInfo(nid, eid string) (map[string]any, error) {
return make(map[string]any), nil
}

5
daemon/libnetwork/drivers/macvlan/macvlan_test.go
View File

@@ -31,6 +31,11 @@ func (dt *driverTester) RegisterDriver(name string, drv driverapi.Driver, capabi
return nil
}
func (dt *driverTester) RegisterNetworkAllocator(name string, _ driverapi.NetworkAllocator) error {
dt.t.Fatalf("Unexpected call to RegisterNetworkAllocator for %q", name)
return nil
}
func TestMacvlanRegister(t *testing.T) {
if err := Register(&driverTester{t: t}, storeutils.NewTempStore(t), nil); err != nil {
t.Fatal(err)

65
daemon/libnetwork/drivers/macvlan/mvmanager/mvmanager.go
View File

@@ -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
}

8
daemon/libnetwork/drivers/null/null.go
View File

@@ -23,14 +23,6 @@ func Register(r driverapi.Registerer) error {
})
}
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 {
d.Lock()
defer d.Unlock()

8
daemon/libnetwork/drivers/overlay/ov_network.go
View File

@@ -82,14 +82,6 @@ func init() {
runtime.LockOSThread()
}
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 {
if id == "" {
return errors.New("invalid network id")

5
daemon/libnetwork/drivers/overlay/overlay_test.go
View File

@@ -35,6 +35,11 @@ func (dt *driverTester) RegisterDriver(name string, drv driverapi.Driver, capabi
return nil
}
func (dt *driverTester) RegisterNetworkAllocator(name string, _ driverapi.NetworkAllocator) error {
dt.t.Fatalf("Unexpected call to RegisterNetworkAllocator for %q", name)
return nil
}
func TestOverlayInit(t *testing.T) {
if err := Register(&driverTester{t: t}, nil); err != nil {
t.Fatal(err)

41
daemon/libnetwork/drivers/overlay/ovmanager/ovmanager.go
View File

@@ -13,8 +13,6 @@ import (
"github.com/moby/moby/v2/daemon/libnetwork/driverapi"
"github.com/moby/moby/v2/daemon/libnetwork/drivers/overlay/overlayutils"
"github.com/moby/moby/v2/daemon/libnetwork/netlabel"
"github.com/moby/moby/v2/daemon/libnetwork/scope"
"github.com/moby/moby/v2/daemon/libnetwork/types"
)
const (
@@ -48,10 +46,7 @@ type network struct {
// Register registers a new instance of the overlay driver.
func Register(r driverapi.Registerer) error {
return r.RegisterDriver(networkType, newDriver(), driverapi.Capability{
DataScope: scope.Global,
ConnectivityScope: scope.Global,
})
return r.RegisterNetworkAllocator(networkType, newDriver())
}
func newDriver() *driver {
@@ -163,40 +158,6 @@ func (n *network) releaseVxlanID() {
}
}
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")
}
// Join method is invoked when a Sandbox is attached to an endpoint.
func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]any) error {
return types.NotImplementedErrorf("not implemented")
}
// Leave method is invoked when a Sandbox detaches from an endpoint.
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
}

5
daemon/libnetwork/drivers/remote/driver.go
View File

@@ -64,6 +64,11 @@ func Register(r driverapi.Registerer, pg plugingetter.PluginGetter) error {
if err = r.RegisterDriver(name, d, *c); err != nil {
log.G(context.TODO()).Errorf("error registering driver for %s due to %v", name, err)
}
if c.DataScope == scope.Global {
if err := r.RegisterNetworkAllocator(name, d); err != nil {
log.G(context.TODO()).Errorf("error registering network allocator for %s due to %v", name, err)
}
}
}
// Unit test code is unaware of a true PluginStore. So we fall back to v1 plugins.

8
daemon/libnetwork/drivers/windows/overlay/ov_network_windows.go
View File

@@ -54,14 +54,6 @@ type network struct {
sync.Mutex
}
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 {
var (
networkName string

8
daemon/libnetwork/drivers/windows/windows.go
View File

@@ -943,14 +943,6 @@ func (d *driver) Leave(nid, eid string) error {
return nil
}
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) Type() string {
return d.name
}

53
daemon/libnetwork/drvregistry/networks.go
View File

@@ -22,8 +22,9 @@ type Networks struct {
// Notify is called whenever a network driver is registered.
Notify driverapi.Registerer
mu sync.Mutex
drivers map[string]driverData
mu sync.Mutex
drivers map[string]driverData
nwAllocs map[string]driverapi.NetworkAllocator
}
var _ driverapi.Registerer = (*Networks)(nil)
@@ -88,3 +89,51 @@ func (nr *Networks) RegisterDriver(ntype string, driver driverapi.Driver, capabi
return nil
}
// NetworkAllocator returns the NetworkAllocator registered under name, and its capability.
func (nr *Networks) NetworkAllocator(name string) driverapi.NetworkAllocator {
nr.mu.Lock()
defer nr.mu.Unlock()
d := nr.nwAllocs[name]
return d
}
func (nr *Networks) RegisterNetworkAllocator(ntype string, nwAlloc driverapi.NetworkAllocator) error {
if strings.TrimSpace(ntype) == "" {
return errors.New("network type string cannot be empty")
}
nr.mu.Lock()
dd, ok := nr.nwAllocs[ntype]
nr.mu.Unlock()
if ok && dd.IsBuiltIn() {
return driverapi.ErrActiveRegistration(ntype)
}
if nr.Notify != nil {
if err := nr.Notify.RegisterNetworkAllocator(ntype, nwAlloc); err != nil {
return err
}
}
nr.mu.Lock()
defer nr.mu.Unlock()
if nr.nwAllocs == nil {
nr.nwAllocs = make(map[string]driverapi.NetworkAllocator)
}
nr.nwAllocs[ntype] = nwAlloc
return nil
}
func (nr *Networks) HasDriverOrNwAllocator(ntype string) bool {
nr.mu.Lock()
defer nr.mu.Unlock()
_, hasDriver := nr.drivers[ntype]
_, hasNwAlloc := nr.nwAllocs[ntype]
return hasDriver || hasNwAlloc
}

8
daemon/libnetwork/libnetwork_internal_test.go
View File

@@ -823,11 +823,3 @@ func (b *badDriver) Type() string {
func (b *badDriver) IsBuiltIn() bool {
return false
}
func (b *badDriver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
return nil, types.NotImplementedErrorf("not implemented")
}
func (b *badDriver) NetworkFree(id string) error {
return types.NotImplementedErrorf("not implemented")
}