ipams: Re-enable legacy remote plugins support

olljanat · olljanat · commit aa492314a13e · 2025-09-19T03:01:25.000-07:00
Signed-off-by: Olli Janatuinen &lt;olli.janatuinen@gmail.com&gt;
diff --git a/daemon/libnetwork/ipams/drivers.go b/daemon/libnetwork/ipams/drivers.go
@@ -11,7 +11,7 @@ import (
 )
 
 // Register registers all the builtin drivers (ie. default, windowsipam, null
-// and remote). If 'pg' is nil, the remote driver won't be registered.
+// and remote). 'pg' is nil here in case of non-managed plugins which Windows is using.
 func Register(r ipamapi.Registerer, pg plugingetter.PluginGetter, lAddrPools, gAddrPools []*ipamutils.NetworkToSplit) error {
 	if err := defaultipam.Register(r, lAddrPools, gAddrPools); err != nil {
 		return err
@@ -22,10 +22,8 @@ func Register(r ipamapi.Registerer, pg plugingetter.PluginGetter, lAddrPools, gA
 	if err := null.Register(r); err != nil {
 		return err
 	}
-	if pg != nil {
-		if err := remoteIpam.Register(r, pg); err != nil {
-			return err
-		}
+	if err := remoteIpam.Register(r, pg); err != nil {
+		return err
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// Register registers all the builtin drivers (ie. default, windowsipam, null`
`14`		`-// and remote). If 'pg' is nil, the remote driver won't be registered.`
	`14`	`+// and remote). 'pg' is nil here in case of non-managed plugins which Windows is using.`
`15`	`15`	`func Register(r ipamapi.Registerer, pg plugingetter.PluginGetter, lAddrPools, gAddrPools []*ipamutils.NetworkToSplit) error {`
`16`	`16`	`if err := defaultipam.Register(r, lAddrPools, gAddrPools); err != nil {`
`17`	`17`	`return err`
`@@ -22,10 +22,8 @@ func Register(r ipamapi.Registerer, pg plugingetter.PluginGetter, lAddrPools, gA`
`22`	`22`	`if err := null.Register(r); err != nil {`
`23`	`23`	`return err`
`24`	`24`	`}`
`25`		`- if pg != nil {`
`26`		`- if err := remoteIpam.Register(r, pg); err != nil {`
`27`		`- return err`
`28`		`- }`
	`25`	`+ if err := remoteIpam.Register(r, pg); err != nil {`
	`26`	`+ return err`
`29`	`27`	`}`
`30`	`28`	`return nil`
`31`	`29`	`}`