feat: etcd default prefix namaepsace

Makefile

@@ -17,7 +17,7 @@ IMAGE_NAME?=h00000000s/easegress
 BUILDER_IMAGE_NAME?=megaease/golang:1.21.7-alpine
 
 # Version
-RELEASE?=v2.7.3
+RELEASE?=v2.7.3-rc1
 
 # Git Related
 GIT_REPO_INFO=$(shell cd ${MKFILE_DIR} && git config --get remote.origin.url)

pkg/cluster/cluster.go

@@ -28,6 +28,7 @@ import (
 
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/client/v3/concurrency"
+	"go.etcd.io/etcd/client/v3/namespace"
 	"go.etcd.io/etcd/server/v3/embed"
 
 	"github.com/megaease/easegress/v2/pkg/logger"
@@ -325,6 +326,9 @@ func (c *cluster) getClient() (*clientv3.Client, error) {
 		return nil, fmt.Errorf("create client failed: %v", err)
 	}
 
+	client.KV = namespace.NewKV(client.KV, c.opt.Cluster.Prefix)
+	client.Lease = namespace.NewLease(client.Lease, c.opt.Cluster.Prefix)
+
 	logger.Infof("client is ready")
 
 	c.client = client

pkg/cluster/syncer.go

@@ -22,10 +22,10 @@ import (
 	"context"
 	"time"
 
+	"github.com/megaease/easegress/v2/pkg/logger"
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
-
-	"github.com/megaease/easegress/v2/pkg/logger"
+	"go.etcd.io/etcd/client/v3/namespace"
 )
 
 type syncer struct {
@@ -78,7 +78,8 @@ func (s *syncer) watch(key string, prefix bool) (clientv3.Watcher, clientv3.Watc
 	if prefix {
 		opts = append(opts, clientv3.WithPrefix())
 	}
-	watcher := clientv3.NewWatcher(s.client)
+
+	watcher := namespace.NewWatcher(s.client, s.cluster.opt.Cluster.Prefix)
 	watchChan := watcher.Watch(context.Background(), key, opts...)
 	logger.Debugf("watcher created for key %s (prefix: %v)", key, prefix)
 	return watcher, watchChan

pkg/cluster/watcher.go

@@ -23,6 +23,7 @@ import (
 
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/namespace"
 
 	"github.com/megaease/easegress/v2/pkg/logger"
 )
@@ -40,7 +41,7 @@ func (c *cluster) Watcher() (Watcher, error) {
 		return nil, fmt.Errorf("get client failed: %v", err)
 	}
 
-	w := clientv3.NewWatcher(client)
+	w := namespace.NewWatcher(client.Watcher, c.opt.Cluster.Prefix)
 
 	return &watcher{
 		w:    w,

pkg/option/option.go

@@ -47,6 +47,7 @@ type ClusterOptions struct {
 	// Secondary members define URLs to connect to cluster formed by primary members.
 	PrimaryListenPeerURLs []string `yaml:"primary-listen-peer-urls"`
 	MaxCallSendMsgSize    int      `yaml:"max-call-send-msg-size"`
+	Prefix                string   `yaml:"prefix"`
 }
 
 // Options is the start-up options.
@@ -119,6 +120,7 @@ func addClusterVars(opt *Options) {
 	opt.flags.StringSliceVar(&opt.Cluster.ListenPeerURLs, "listen-peer-urls", []string{"http://localhost:2380"}, "List of URLs to listen on for cluster peer traffic.")
 	opt.flags.StringSliceVar(&opt.Cluster.AdvertiseClientURLs, "advertise-client-urls", []string{"http://localhost:2379"}, "List of this member's client URLs to advertise to the rest of the cluster.")
 	opt.flags.StringSliceVar(&opt.Cluster.InitialAdvertisePeerURLs, "initial-advertise-peer-urls", []string{"http://localhost:2380"}, "List of this member's peer URLs to advertise to the rest of the cluster.")
+	opt.flags.StringVar(&opt.Cluster.Prefix, "prefix", "", "etcd default prefix namespace")
 	opt.flags.StringToStringVarP(&opt.Cluster.InitialCluster, "initial-cluster", "", nil, "List of (member name, URL) pairs that will form the cluster. E.g. primary-1=http://localhost:2380.")
 	opt.flags.StringVar(&opt.Cluster.StateFlag, "state-flag", "new", "Cluster state (new, existing)")
 	opt.flags.StringSliceVar(&opt.Cluster.PrimaryListenPeerURLs, "primary-listen-peer-urls", []string{"http://localhost:2380"}, "List of peer URLs of primary members. Define this only, when cluster-role is secondary.")