1. docker
  2. Commit 6e512cc2927eb04e093c95aa19a1b5eb6695fc55
Browse code

libnet/d/ipvlan: Register: remove unused config param

Signed-off-by: Albin Kerouanton <albinker@gmail.com>

Albin Kerouanton authored on 2025/08/30 18:45:43
Showing 3 changed files
daemon/libnetwork/drivers/ipvlan/ipvlan.go
History View file @ 6e512cc
... ... 
@@ -61,7 +61,7 @@ type network struct {
61 61 
 }
62 62
63 63 
 // Register initializes and registers the libnetwork ipvlan driver.
64 
-func Register(r driverapi.Registerer, store *datastore.Store, config map[string]any) error {
64 
+func Register(r driverapi.Registerer, store *datastore.Store) error {
65 65 
 	d := &driver{
66 66 
 		store:    store,
67 67 
 		networks: networkTable{},
daemon/libnetwork/drivers/ipvlan/ipvlan_test.go
History View file @ 6e512cc
... ... 
@@ -37,14 +37,14 @@ func (dt *driverTester) RegisterNetworkAllocator(name string, _ driverapi.Networ
37 37 
 }
38 38
39 39 
 func TestIpvlanRegister(t *testing.T) {
40 
-	if err := Register(&driverTester{t: t}, storeutils.NewTempStore(t), nil); err != nil {
40 
+	if err := Register(&driverTester{t: t}, storeutils.NewTempStore(t)); err != nil {
41 41 
 		t.Fatal(err)
42 42 
 	}
43 43 
 }
44 44
45 45 
 func TestIpvlanNilConfig(t *testing.T) {
46 46 
 	dt := &driverTester{t: t}
47 
-	if err := Register(dt, storeutils.NewTempStore(t), nil); err != nil {
47 
+	if err := Register(dt, storeutils.NewTempStore(t)); err != nil {
48 48 
 		t.Fatal(err)
49 49 
 	}
50 50
... ... 
@@ -55,7 +55,7 @@ func TestIpvlanNilConfig(t *testing.T) {
55 55
56 56 
 func TestIpvlanType(t *testing.T) {
57 57 
 	dt := &driverTester{t: t}
58 
-	if err := Register(dt, storeutils.NewTempStore(t), nil); err != nil {
58 
+	if err := Register(dt, storeutils.NewTempStore(t)); err != nil {
59 59 
 		t.Fatal(err)
60 60 
 	}
61 61
daemon/libnetwork/drivers_linux.go
History View file @ 6e512cc
... ... 
@@ -30,7 +30,9 @@ func registerNetworkDrivers(r driverapi.Registerer, store *datastore.Store, pms
30 30 
 		{ntype: host.NetworkType, register: func(r driverapi.Registerer, _ *datastore.Store, _ map[string]any) error {
31 31 
 			return host.Register(r)
32 32 
 		}},
33 
-		{ntype: ipvlan.NetworkType, register: ipvlan.Register},
33 
+		{ntype: ipvlan.NetworkType, register: func(r driverapi.Registerer, store *datastore.Store, _ map[string]any) error {
34 
+			return ipvlan.Register(r, store)
35 
+		}},
34 36 
 		{ntype: macvlan.NetworkType, register: func(r driverapi.Registerer, store *datastore.Store, _ map[string]any) error {
35 37 
 			return macvlan.Register(r, store)
36 38 
 		}},