From c8d2c6ea770c7f2c19f6394cfa23128f2c1099b8 Mon Sep 17 00:00:00 2001 From: Albin Kerouanton Date: Fri, 10 Feb 2023 16:03:52 +0100 Subject: libnetwork: remove unused props from windows overlay driver The overlay driver was creating a global store whenever netlabel.GlobalKVClient was specified in its config argument. This specific label is unused anymore since 142b522 (moby/moby#44875). It was also creating a local store whenever netlabel.LocalKVClient was specificed in its config argument. This store is unused since moby/libnetwork@9e72136 (moby/libnetwork#1636). Finally, the sync.Once properties are never used and thus can be deleted. Signed-off-by: Albin Kerouanton --- .../drivers/windows/overlay/overlay_windows.go | 33 ++-------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'libnetwork') diff --git a/libnetwork/drivers/windows/overlay/overlay_windows.go b/libnetwork/drivers/windows/overlay/overlay_windows.go index c406a5a251..19e11a25b6 100644 --- a/libnetwork/drivers/windows/overlay/overlay_windows.go +++ b/libnetwork/drivers/windows/overlay/overlay_windows.go @@ -11,7 +11,6 @@ import ( "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/driverapi" - "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/types" "github.com/sirupsen/logrus" ) @@ -21,12 +20,8 @@ const ( ) type driver struct { - config map[string]interface{} - networks networkTable - store datastore.DataStore - localStore datastore.DataStore - once sync.Once - joinOnce sync.Once + config map[string]interface{} + networks networkTable sync.Mutex } @@ -42,30 +37,6 @@ func Register(r driverapi.Registerer, config map[string]interface{}) error { config: config, } - if data, ok := config[netlabel.GlobalKVClient]; ok { - var err error - dsc, ok := data.(discoverapi.DatastoreConfigData) - if !ok { - return types.InternalErrorf("incorrect data in datastore configuration: %v", data) - } - d.store, err = datastore.NewDataStoreFromConfig(dsc) - if err != nil { - return types.InternalErrorf("failed to initialize data store: %v", err) - } - } - - if data, ok := config[netlabel.LocalKVClient]; ok { - var err error - dsc, ok := data.(discoverapi.DatastoreConfigData) - if !ok { - return types.InternalErrorf("incorrect data in datastore configuration: %v", data) - } - d.localStore, err = datastore.NewDataStoreFromConfig(dsc) - if err != nil { - return types.InternalErrorf("failed to initialize local data store: %v", err) - } - } - d.restoreHNSNetworks() return r.RegisterDriver(networkType, d, c) -- cgit v1.2.1