mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
ipams: Re-enable legacy remote plugins support
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
(cherry picked from commit aa492314a1)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
committed by
Paweł Gronowski
parent
46dcd7f33e
commit
1b0ba3b217
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user