From f2f57b4a4b00ff80fdc96676f462a204150a0007 Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Wed, 20 Nov 2024 18:53:09 +0000
Subject: [PATCH] Remove unused code from etcdproxy

None of these fields or functions are used in k3s or rke2

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 pkg/etcd/etcdproxy.go | 58 ++++++-------------------------------------
 1 file changed, 8 insertions(+), 50 deletions(-)

diff --git a/pkg/etcd/etcdproxy.go b/pkg/etcd/etcdproxy.go
index 55918850b3..141ba679b5 100644
--- a/pkg/etcd/etcdproxy.go
+++ b/pkg/etcd/etcdproxy.go
@@ -6,21 +6,16 @@ import (
 	"fmt"
 	"net"
 	"net/http"
-	"net/url"
 	"strconv"
 	"time"
 
 	"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 type Proxy interface {
 	Update(addresses []string)
-	ETCDURL() string
-	ETCDAddresses() []string
-	ETCDServerURL() string
 }
 
 var httpClient = &http.Client{
@@ -34,44 +29,22 @@ var httpClient = &http.Client{
 // NewETCDProxy initializes a new proxy structure that contain a load balancer
 // which listens on port 2379 and proxy between etcd cluster members
 func NewETCDProxy(ctx context.Context, supervisorPort int, dataDir, etcdURL string, isIPv6 bool) (Proxy, error) {
-	u, err := url.Parse(etcdURL)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to parse etcd client URL")
-	}
-
-	e := &etcdproxy{
-		dataDir:        dataDir,
-		initialETCDURL: etcdURL,
-		etcdURL:        etcdURL,
-		supervisorPort: supervisorPort,
-		disconnect:     map[string]context.CancelFunc{},
-	}
-
 	lb, err := loadbalancer.New(ctx, dataDir, loadbalancer.ETCDServerServiceName, etcdURL, 2379, isIPv6)
 	if err != nil {
 		return nil, err
 	}
-	e.etcdLB = lb
-	e.etcdLBURL = lb.LoadBalancerServerURL()
 
-	e.fallbackETCDAddress = u.Host
-	e.etcdPort = u.Port()
-
-	return e, nil
+	return &etcdproxy{
+		supervisorPort: supervisorPort,
+		etcdLB:         lb,
+		disconnect:     map[string]context.CancelFunc{},
+	}, nil
 }
 
 type etcdproxy struct {
-	dataDir   string
-	etcdLBURL string
-
-	supervisorPort      int
-	initialETCDURL      string
-	etcdURL             string
-	etcdPort            string
-	fallbackETCDAddress string
-	etcdAddresses       []string
-	etcdLB              *loadbalancer.LoadBalancer
-	disconnect          map[string]context.CancelFunc
+	supervisorPort int
+	etcdLB         *loadbalancer.LoadBalancer
+	disconnect     map[string]context.CancelFunc
 }
 
 func (e *etcdproxy) Update(addresses []string) {
@@ -95,21 +68,6 @@ func (e *etcdproxy) Update(addresses []string) {
 	}
 }
 
-func (e *etcdproxy) ETCDURL() string {
-	return e.etcdURL
-}
-
-func (e *etcdproxy) ETCDAddresses() []string {
-	if len(e.etcdAddresses) > 0 {
-		return e.etcdAddresses
-	}
-	return []string{e.fallbackETCDAddress}
-}
-
-func (e *etcdproxy) ETCDServerURL() string {
-	return e.etcdURL
-}
-
 // start a polling routine that makes periodic requests to the etcd node's supervisor port.
 // If the request fails, the node is marked unhealthy.
 func (e etcdproxy) createHealthCheck(ctx context.Context, address string) func() bool {