mirror of https://github.com/k3s-io/k3s
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>pull/11430/head
parent
183f0c8d09
commit
f2f57b4a4b
|
@ -6,21 +6,16 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
|
"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Proxy interface {
|
type Proxy interface {
|
||||||
Update(addresses []string)
|
Update(addresses []string)
|
||||||
ETCDURL() string
|
|
||||||
ETCDAddresses() []string
|
|
||||||
ETCDServerURL() string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var httpClient = &http.Client{
|
var httpClient = &http.Client{
|
||||||
|
@ -34,42 +29,20 @@ var httpClient = &http.Client{
|
||||||
// NewETCDProxy initializes a new proxy structure that contain a load balancer
|
// NewETCDProxy initializes a new proxy structure that contain a load balancer
|
||||||
// which listens on port 2379 and proxy between etcd cluster members
|
// 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) {
|
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)
|
lb, err := loadbalancer.New(ctx, dataDir, loadbalancer.ETCDServerServiceName, etcdURL, 2379, isIPv6)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
e.etcdLB = lb
|
|
||||||
e.etcdLBURL = lb.LoadBalancerServerURL()
|
|
||||||
|
|
||||||
e.fallbackETCDAddress = u.Host
|
return &etcdproxy{
|
||||||
e.etcdPort = u.Port()
|
supervisorPort: supervisorPort,
|
||||||
|
etcdLB: lb,
|
||||||
return e, nil
|
disconnect: map[string]context.CancelFunc{},
|
||||||
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type etcdproxy struct {
|
type etcdproxy struct {
|
||||||
dataDir string
|
|
||||||
etcdLBURL string
|
|
||||||
|
|
||||||
supervisorPort int
|
supervisorPort int
|
||||||
initialETCDURL string
|
|
||||||
etcdURL string
|
|
||||||
etcdPort string
|
|
||||||
fallbackETCDAddress string
|
|
||||||
etcdAddresses []string
|
|
||||||
etcdLB *loadbalancer.LoadBalancer
|
etcdLB *loadbalancer.LoadBalancer
|
||||||
disconnect map[string]context.CancelFunc
|
disconnect map[string]context.CancelFunc
|
||||||
}
|
}
|
||||||
|
@ -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.
|
// start a polling routine that makes periodic requests to the etcd node's supervisor port.
|
||||||
// If the request fails, the node is marked unhealthy.
|
// If the request fails, the node is marked unhealthy.
|
||||||
func (e etcdproxy) createHealthCheck(ctx context.Context, address string) func() bool {
|
func (e etcdproxy) createHealthCheck(ctx context.Context, address string) func() bool {
|
||||||
|
|
Loading…
Reference in New Issue