From b67446a8fa4b1459cd33150d25b3b253eaed89bc Mon Sep 17 00:00:00 2001
From: Albin Kerouanton <albinker@gmail.com>
Date: Fri, 3 Mar 2023 23:28:17 +0100
Subject: libnetwork: remove local store from overlay driver

Since the previous commit, data from the local store are never read,
thus proving it was only used for Classic Swarm.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
---
 libnetwork/drivers/overlay/joinleave.go   |  4 ----
 libnetwork/drivers/overlay/ov_endpoint.go | 24 ------------------------
 libnetwork/drivers/overlay/ov_network.go  |  4 ----
 libnetwork/drivers/overlay/overlay.go     | 15 ---------------
 4 files changed, 47 deletions(-)

(limited to 'libnetwork')

diff --git a/libnetwork/drivers/overlay/joinleave.go b/libnetwork/drivers/overlay/joinleave.go
index 3e9760234b..f2b7969645 100644
--- a/libnetwork/drivers/overlay/joinleave.go
+++ b/libnetwork/drivers/overlay/joinleave.go
@@ -59,10 +59,6 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,
 
 	ep.ifName = containerIfName
 
-	if err = d.writeEndpointToStore(ep); err != nil {
-		return fmt.Errorf("failed to update overlay endpoint %.7s to local data store: %v", ep.id, err)
-	}
-
 	// Set the container interface and its peer MTU to 1450 to allow
 	// for 50 bytes vxlan encap (inner eth header(14) + outer IP(20) +
 	// outer UDP(8) + vxlan header(8))
diff --git a/libnetwork/drivers/overlay/ov_endpoint.go b/libnetwork/drivers/overlay/ov_endpoint.go
index 76619966d3..9fc94085af 100644
--- a/libnetwork/drivers/overlay/ov_endpoint.go
+++ b/libnetwork/drivers/overlay/ov_endpoint.go
@@ -92,10 +92,6 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
 
 	n.addEndpoint(ep)
 
-	if err := d.writeEndpointToStore(ep); err != nil {
-		return fmt.Errorf("failed to update overlay endpoint %.7s to local store: %v", ep.id, err)
-	}
-
 	return nil
 }
 
@@ -118,10 +114,6 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {
 
 	n.deleteEndpoint(eid)
 
-	if err := d.deleteEndpointFromStore(ep); err != nil {
-		logrus.Warnf("Failed to delete overlay endpoint %.7s from local store: %v", ep.id, err)
-	}
-
 	if ep.ifName == "" {
 		return nil
 	}
@@ -142,22 +134,6 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
 	return make(map[string]interface{}), nil
 }
 
-func (d *driver) deleteEndpointFromStore(e *endpoint) error {
-	if d.localStore == nil {
-		return fmt.Errorf("overlay local store not initialized, ep not deleted")
-	}
-
-	return d.localStore.DeleteObjectAtomic(e)
-}
-
-func (d *driver) writeEndpointToStore(e *endpoint) error {
-	if d.localStore == nil {
-		return fmt.Errorf("overlay local store not initialized, ep not added")
-	}
-
-	return d.localStore.PutObjectAtomic(e)
-}
-
 func (ep *endpoint) DataScope() string {
 	return datastore.LocalScope
 }
diff --git a/libnetwork/drivers/overlay/ov_network.go b/libnetwork/drivers/overlay/ov_network.go
index aecdc7349a..935ebe2357 100644
--- a/libnetwork/drivers/overlay/ov_network.go
+++ b/libnetwork/drivers/overlay/ov_network.go
@@ -224,10 +224,6 @@ func (d *driver) DeleteNetwork(nid string) error {
 				}
 			}
 		}
-
-		if err := d.deleteEndpointFromStore(ep); err != nil {
-			logrus.Warnf("Failed to delete overlay endpoint %.7s from local store: %v", ep.id, err)
-		}
 	}
 
 	doPeerFlush = true
diff --git a/libnetwork/drivers/overlay/overlay.go b/libnetwork/drivers/overlay/overlay.go
index f4f872f73f..722c36e320 100644
--- a/libnetwork/drivers/overlay/overlay.go
+++ b/libnetwork/drivers/overlay/overlay.go
@@ -12,8 +12,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"
 )
 
@@ -32,7 +30,6 @@ type driver struct {
 	peerDb           peerNetworkMap
 	secMap           *encrMap
 	networks         networkTable
-	localStore       datastore.DataStore
 	initOS           sync.Once
 	localJoinOnce    sync.Once
 	keys             []*key
@@ -55,18 +52,6 @@ func Register(r driverapi.Registerer, config map[string]interface{}) error {
 		config: config,
 	}
 
-	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)
-		}
-	}
-
 	return r.RegisterDriver(networkType, d, c)
 }
 
-- 
cgit v1.2.1