From c6dfc70b3300b8a4000a550cc25781fd57921172 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Thu, 22 Dec 2016 13:46:19 -0800 Subject: [PATCH] Make use of GetAllManagedPluginsForCap to avoid loading v1-plugins Read this for more details : https://github.com/docker/docker/pull/29665 Signed-off-by: Madhu Venugopal --- libnetwork/drivers/remote/driver.go | 2 +- libnetwork/ipams/remote/remote.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libnetwork/drivers/remote/driver.go b/libnetwork/drivers/remote/driver.go index 12a8fb0cdb..f35a941f09 100644 --- a/libnetwork/drivers/remote/driver.go +++ b/libnetwork/drivers/remote/driver.go @@ -46,7 +46,7 @@ func Init(dc driverapi.DriverCallback, config map[string]interface{}) error { handleFunc := plugins.Handle if pg := dc.GetPluginGetter(); pg != nil { handleFunc = pg.Handle - activePlugins, _ := pg.GetAllByCap(driverapi.NetworkPluginEndpointType) + activePlugins := pg.GetAllManagedPluginsByCap(driverapi.NetworkPluginEndpointType) for _, ap := range activePlugins { newPluginHandler(ap.Name(), ap.Client()) } diff --git a/libnetwork/ipams/remote/remote.go b/libnetwork/ipams/remote/remote.go index 3da05260e6..d2e2b4f3c8 100644 --- a/libnetwork/ipams/remote/remote.go +++ b/libnetwork/ipams/remote/remote.go @@ -50,7 +50,7 @@ func Init(cb ipamapi.Callback, l, g interface{}) error { handleFunc := plugins.Handle if pg := cb.GetPluginGetter(); pg != nil { handleFunc = pg.Handle - activePlugins, _ := pg.GetAllByCap(ipamapi.PluginEndpointType) + activePlugins := pg.GetAllManagedPluginsByCap(ipamapi.PluginEndpointType) for _, ap := range activePlugins { newPluginHandler(ap.Name(), ap.Client()) }