Fix issues with defragment and alarm clear on etcd startup

go.mod

@@ -135,9 +135,11 @@ require (
 	github.com/vishvananda/netlink v1.2.1-beta.2
 	github.com/yl2chen/cidranger v1.0.2
 	go.etcd.io/etcd/api/v3 v3.5.16
+	go.etcd.io/etcd/client/pkg/v3 v3.5.16
 	go.etcd.io/etcd/client/v3 v3.5.16
 	go.etcd.io/etcd/etcdutl/v3 v3.5.13
 	go.etcd.io/etcd/server/v3 v3.5.16
+	go.uber.org/zap v1.27.0
 	golang.org/x/crypto v0.27.0
 	golang.org/x/net v0.28.0
 	golang.org/x/sync v0.8.0
@@ -423,7 +425,6 @@ require (
 	github.com/xlab/treeprint v1.2.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	go.etcd.io/bbolt v1.3.11 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
 	go.etcd.io/etcd/client/v2 v2.305.16 // indirect
 	go.etcd.io/etcd/pkg/v3 v3.5.16 // indirect
 	go.etcd.io/etcd/raft/v3 v3.5.16 // indirect
@@ -445,7 +446,6 @@ require (
 	go.uber.org/fx v1.20.1 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect

pkg/etcd/resolver.go

+package etcd
+
+import (
+	"net/url"
+	"path"
+	"strings"
+
+	"google.golang.org/grpc/resolver"
+	"google.golang.org/grpc/resolver/manual"
+)
+
+const scheme = "etcd-endpoint"
+
+type EtcdSimpleResolver struct {
+	*manual.Resolver
+	endpoint string
+}
+
+// Cribbed from https://github.com/etcd-io/etcd/blob/v3.5.16/client/v3/internal/resolver/resolver.go
+// but only supports a single fixed endpoint. We use this instead of the internal etcd client resolver
+// because the agent loadbalancer handles failover and we don't want etcd or grpc's special behavior.
+func NewSimpleResolver(endpoint string) *EtcdSimpleResolver {
+	r := manual.NewBuilderWithScheme(scheme)
+	return &EtcdSimpleResolver{Resolver: r, endpoint: endpoint}
+}
+
+func (r *EtcdSimpleResolver) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
+	res, err := r.Resolver.Build(target, cc, opts)
+	if err != nil {
+		return nil, err
+	}
+
+	if r.CC != nil {
+		addr, serverName := interpret(r.endpoint)
+		r.UpdateState(resolver.State{
+			Addresses: []resolver.Address{{Addr: addr, ServerName: serverName}},
+		})
+	}
+
+	return res, nil
+}
+
+func interpret(ep string) (string, string) {
+	if strings.HasPrefix(ep, "unix:") || strings.HasPrefix(ep, "unixs:") {
+		if strings.HasPrefix(ep, "unix:///") || strings.HasPrefix(ep, "unixs:///") {
+			_, absolutePath, _ := strings.Cut(ep, "://")
+			return "unix://" + absolutePath, path.Base(absolutePath)
+		}
+		if strings.HasPrefix(ep, "unix://") || strings.HasPrefix(ep, "unixs://") {
+			_, localPath, _ := strings.Cut(ep, "://")
+			return "unix:" + localPath, path.Base(localPath)
+		}
+		_, localPath, _ := strings.Cut(ep, ":")
+		return "unix:" + localPath, path.Base(localPath)
+	}
+	if strings.Contains(ep, "://") {
+		url, err := url.Parse(ep)
+		if err != nil {
+			return ep, ep
+		}
+		if url.Scheme == "http" || url.Scheme == "https" {
+			return url.Host, url.Host
+		}
+		return ep, url.Host
+	}
+	return ep, ep
+}
+
+func authority(ep string) string {
+	if _, authority, ok := strings.Cut(ep, "://"); ok {
+		return authority
+	}
+	if suff, ok := strings.CutPrefix(ep, "unix:"); ok {
+		return suff
+	}
+	if suff, ok := strings.CutPrefix(ep, "unixs:"); ok {
+		return suff
+	}
+	return ep
+}

pkg/etcd/snapshot.go

@@ -27,7 +27,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/robfig/cron/v3"
 	"github.com/sirupsen/logrus"
-	snapshotv3 "go.etcd.io/etcd/etcdutl/v3/snapshot"
+	snapshotv3 "go.etcd.io/etcd/client/v3/snapshot"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -243,7 +243,7 @@ func (e *ETCD) Snapshot(ctx context.Context) (*managed.SnapshotResult, error) {
 
 	var sf *snapshot.File
 
-	if err := snapshotv3.NewV3(e.client.GetLogger()).Save(ctx, *cfg, snapshotPath); err != nil {
+	if err := snapshotv3.Save(ctx, e.client.GetLogger(), *cfg, snapshotPath); err != nil {
 		sf = &snapshot.File{
 			Name:     snapshotName,
 			Location: "",