Merge pull request #45855 from thaJeztah/remove_overlay_cfg

libnetwork/drivers: remove unused "config" parameters and fields

libnetwork/drivers/bridge/bridge.go

@@ -174,12 +174,10 @@ func Register(r driverapi.Registerer, config map[string]interface{}) error {
 	if err := d.configure(config); err != nil {
 		return err
 	}
-
-	c := driverapi.Capability{
+	return r.RegisterDriver(networkType, d, driverapi.Capability{
 		DataScope:         datastore.LocalScope,
 		ConnectivityScope: datastore.LocalScope,
-	}
-	return r.RegisterDriver(networkType, d, c)
+	})
 }
 
 // Validate performs a static validation on the network configuration parameters.

libnetwork/drivers/bridge/brmanager/brmanager.go

@@ -14,17 +14,16 @@ type driver struct{}
 // Init registers a new instance of bridge manager driver.
 //
 // Deprecated: use [Register].
-func Init(dc driverapi.DriverCallback, config map[string]interface{}) error {
-	return Register(dc, config)
+func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
+	return Register(dc, nil)
 }
 
 // Register registers a new instance of the bridge manager driver with r.
-func Register(r driverapi.Registerer, config map[string]interface{}) error {
-	c := driverapi.Capability{
+func Register(r driverapi.Registerer, _ map[string]interface{}) error {
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
 		DataScope:         datastore.LocalScope,
 		ConnectivityScope: datastore.LocalScope,
-	}
-	return r.RegisterDriver(networkType, &driver{}, c)
+	})
 }
 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

libnetwork/drivers/host/host.go

@@ -19,16 +19,15 @@ type driver struct {
 // Init registers a new instance of host driver.
 //
 // Deprecated: use [Register].
-func Init(dc driverapi.DriverCallback, config map[string]interface{}) error {
-	return Register(dc, config)
+func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
+	return Register(dc, nil)
 }
 
-func Register(r driverapi.Registerer, config map[string]interface{}) error {
-	c := driverapi.Capability{
+func Register(r driverapi.Registerer, _ map[string]interface{}) error {
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
 		DataScope:         datastore.LocalScope,
 		ConnectivityScope: datastore.LocalScope,
-	}
-	return r.RegisterDriver(networkType, &driver{}, c)
+	})
 }
 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

libnetwork/drivers/ipvlan/ipvlan.go

@@ -64,18 +64,16 @@ type network struct {
 
 // Register initializes and registers the libnetwork ipvlan driver.
 func Register(r driverapi.Registerer, config map[string]interface{}) error {
-	c := driverapi.Capability{
-		DataScope:         datastore.LocalScope,
-		ConnectivityScope: datastore.GlobalScope,
-	}
 	d := &driver{
 		networks: networkTable{},
 	}
 	if err := d.initStore(config); err != nil {
 		return err
 	}
-
-	return r.RegisterDriver(driverName, d, c)
+	return r.RegisterDriver(driverName, d, driverapi.Capability{
+		DataScope:         datastore.LocalScope,
+		ConnectivityScope: datastore.GlobalScope,
+	})
 }
 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

libnetwork/drivers/ipvlan/ivmanager/ivmanager.go

@@ -14,17 +14,16 @@ type driver struct{}
 // Init registers a new instance of the ipvlan manager driver.
 //
 // Deprecated: use [Register].
-func Init(dc driverapi.DriverCallback, config map[string]interface{}) error {
-	return Register(dc, config)
+func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
+	return Register(dc, nil)
 }
 
 // Register registers a new instance of the ipvlan manager driver.
-func Register(r driverapi.Registerer, config map[string]interface{}) error {
-	c := driverapi.Capability{
+func Register(r driverapi.Registerer, _ map[string]interface{}) error {
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
 		DataScope:         datastore.LocalScope,
 		ConnectivityScope: datastore.GlobalScope,
-	}
-	return r.RegisterDriver(networkType, &driver{}, c)
+	})
 }
 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

libnetwork/drivers/macvlan/macvlan.go

@@ -58,18 +58,16 @@ type network struct {
 
 // Register initializes and registers the libnetwork macvlan driver
 func Register(r driverapi.Registerer, config map[string]interface{}) error {
-	c := driverapi.Capability{
-		DataScope:         datastore.LocalScope,
-		ConnectivityScope: datastore.GlobalScope,
-	}
 	d := &driver{
 		networks: networkTable{},
 	}
 	if err := d.initStore(config); err != nil {
 		return err
 	}
-
-	return r.RegisterDriver(driverName, d, c)
+	return r.RegisterDriver(driverName, d, driverapi.Capability{
+		DataScope:         datastore.LocalScope,
+		ConnectivityScope: datastore.GlobalScope,
+	})
 }
 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

libnetwork/drivers/macvlan/mvmanager/mvmanager.go

@@ -14,17 +14,16 @@ type driver struct{}
 // Init registers a new instance of the macvlan manager driver.
 //
 // Deprecated: use [Register].
-func Init(dc driverapi.DriverCallback, config map[string]interface{}) error {
-	return Register(dc, config)
+func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
+	return Register(dc, nil)
 }
 
 // Register registers a new instance of the macvlan manager driver.
-func Register(r driverapi.Registerer, config map[string]interface{}) error {
-	c := driverapi.Capability{
+func Register(r driverapi.Registerer, _ map[string]interface{}) error {
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
 		DataScope:         datastore.LocalScope,
 		ConnectivityScope: datastore.GlobalScope,
-	}
-	return r.RegisterDriver(networkType, &driver{}, c)
+	})
 }
 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

libnetwork/drivers/null/null.go

@@ -17,11 +17,10 @@ type driver struct {
 }
 
 // Register registers a new instance of the null driver.
-func Register(r driverapi.Registerer, config map[string]interface{}) error {
-	c := driverapi.Capability{
+func Register(r driverapi.Registerer, _ map[string]interface{}) error {
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
 		DataScope: datastore.LocalScope,
-	}
-	return r.RegisterDriver(networkType, &driver{}, c)
+	})
 }
 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

libnetwork/drivers/overlay/overlay.go

@@ -39,10 +39,6 @@ type driver struct {
 
 // Register registers a new instance of the overlay driver.
 func Register(r driverapi.Registerer, config map[string]interface{}) error {
-	c := driverapi.Capability{
-		DataScope:         datastore.GlobalScope,
-		ConnectivityScope: datastore.GlobalScope,
-	}
 	d := &driver{
 		networks: networkTable{},
 		peerDb: peerNetworkMap{
@@ -51,8 +47,10 @@ func Register(r driverapi.Registerer, config map[string]interface{}) error {
 		secMap: &encrMap{nodes: map[string][]*spi{}},
 		config: config,
 	}
-
-	return r.RegisterDriver(networkType, d, c)
+	return r.RegisterDriver(networkType, d, driverapi.Capability{
+		DataScope:         datastore.GlobalScope,
+		ConnectivityScope: datastore.GlobalScope,
+	})
 }
 
 func (d *driver) configure() error {

libnetwork/drivers/overlay/ovmanager/ovmanager.go

@@ -26,7 +26,6 @@ const (
 type networkTable map[string]*network
 
 type driver struct {
-	config   map[string]interface{}
 	networks networkTable
 	vxlanIdm *idm.Idm
 	sync.Mutex
@@ -48,21 +47,15 @@ type network struct {
 // Init registers a new instance of the overlay driver.
 //
 // Deprecated: use [Register].
-func Init(dc driverapi.DriverCallback, config map[string]interface{}) error {
-	return Register(dc, config)
+func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
+	return Register(dc, nil)
 }
 
 // Register registers a new instance of the overlay driver.
-func Register(r driverapi.DriverCallback, config map[string]interface{}) error {
+func Register(r driverapi.Registerer, _ map[string]interface{}) error {
 	var err error
-	c := driverapi.Capability{
-		DataScope:         datastore.GlobalScope,
-		ConnectivityScope: datastore.GlobalScope,
-	}
-
 	d := &driver{
 		networks: networkTable{},
-		config:   config,
 	}
 
 	d.vxlanIdm, err = idm.New(nil, "vxlan-id", 0, vxlanIDEnd)
@@ -70,7 +63,10 @@ func Register(r driverapi.DriverCallback, config map[string]interface{}) error {
 		return fmt.Errorf("failed to initialize vxlan id manager: %v", err)
 	}
 
-	return r.RegisterDriver(networkType, d, c)
+	return r.RegisterDriver(networkType, d, driverapi.Capability{
+		DataScope:         datastore.GlobalScope,
+		ConnectivityScope: datastore.GlobalScope,
+	})
 }
 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {

libnetwork/drivers/remote/driver.go

@@ -33,7 +33,7 @@ func newDriver(name string, client *plugins.Client) driverapi.Driver {
 // plugin is activated.
 //
 // Deprecated: use [Register].
-func Init(dc driverapi.DriverCallback, config map[string]interface{}) error {
+func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
 	return Register(dc, dc.GetPluginGetter())
 }
 

libnetwork/drivers/windows/overlay/overlay_windows.go

@@ -21,26 +21,22 @@ const (
 )
 
 type driver struct {
-	config   map[string]interface{}
 	networks networkTable
 	sync.Mutex
 }
 
 // Register registers a new instance of the overlay driver.
-func Register(r driverapi.Registerer, config map[string]interface{}) error {
-	c := driverapi.Capability{
-		DataScope:         datastore.GlobalScope,
-		ConnectivityScope: datastore.GlobalScope,
-	}
-
+func Register(r driverapi.Registerer, _ map[string]interface{}) error {
 	d := &driver{
 		networks: networkTable{},
-		config:   config,
 	}
 
 	d.restoreHNSNetworks()
 
-	return r.RegisterDriver(networkType, d, c)
+	return r.RegisterDriver(networkType, d, driverapi.Capability{
+		DataScope:         datastore.GlobalScope,
+		ConnectivityScope: datastore.GlobalScope,
+	})
 }
 
 func (d *driver) restoreHNSNetworks() error {
@@ -64,7 +60,7 @@ func (d *driver) restoreHNSNetworks() error {
 		// We assume that any network will be recreated on daemon restart
 		// and therefore don't restore hns endpoints for now
 		//
-		//n.restoreNetworkEndpoints()
+		// n.restoreNetworkEndpoints()
 	}
 
 	return nil