summaryrefslogtreecommitdiff
path: root/libnetwork
diff options
context:
space:
mode:
authorAlbin Kerouanton <albinker@gmail.com>2023-02-10 16:03:52 +0100
committerAlbin Kerouanton <albinker@gmail.com>2023-04-06 19:33:04 +0200
commitc8d2c6ea770c7f2c19f6394cfa23128f2c1099b8 (patch)
tree0bbda144b0d61f2437f56aab7f6baa78e75ee7e4 /libnetwork
parent0fa873c0fef0c117d7561b08b083292cc3305b79 (diff)
downloaddocker-c8d2c6ea770c7f2c19f6394cfa23128f2c1099b8.tar.gz
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 <albinker@gmail.com>
Diffstat (limited to 'libnetwork')
-rw-r--r--libnetwork/drivers/windows/overlay/overlay_windows.go33
1 files changed, 2 insertions, 31 deletions
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)