github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Drop etcd v2 support from etcd migration image

Browse Source
This commit is contained in:
Jordan Liggitt 2021-03-23 10:54:26 -04:00
parent 36896f9cab
commit 5f1983d871
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cluster/images/etcd/migrate/migrate_client.go
View File

@ -26,7 +26,6 @@ import (
"strings"
"time"
clientv2 "go.etcd.io/etcd/client"
"go.etcd.io/etcd/clientv3"
"google.golang.org/grpc"
"k8s.io/klog/v2"
@ -57,14 +56,6 @@ func (e *CombinedEtcdClient) SetEtcdVersionKeyValue(version *EtcdVersion) error
// Put write a single key value pair to etcd.
func (e *CombinedEtcdClient) Put(version *EtcdVersion, key, value string) error {
if version.Major == 2 {
v2client, err := e.clientV2()
if err != nil {
return err
}
_, err = v2client.Set(context.Background(), key, value, nil)
return err
}
v3client, err := e.clientV3()
if err != nil {
return err
@ -76,17 +67,6 @@ func (e *CombinedEtcdClient) Put(version *EtcdVersion, key, value string) error
// Get reads a single value for a given key.
func (e *CombinedEtcdClient) Get(version *EtcdVersion, key string) (string, error) {
if version.Major == 2 {
v2client, err := e.clientV2()
if err != nil {
return "", err
}
resp, err := v2client.Get(context.Background(), key, nil)
if err != nil {
return "", err
}
return resp.Node.Value, nil
}
v3client, err := e.clientV3()
if err != nil {
return "", err
@ -104,14 +84,6 @@ func (e *CombinedEtcdClient) Get(version *EtcdVersion, key string) (string, erro
return string(kvs[0].Value), nil
}
func (e *CombinedEtcdClient) clientV2() (clientv2.KeysAPI, error) {
v2client, err := clientv2.New(clientv2.Config{Endpoints: []string{e.endpoint()}})
if err != nil {
return nil, err
}
return clientv2.NewKeysAPI(v2client), nil
}
func (e *CombinedEtcdClient) clientV3() (*clientv3.Client, error) {
return clientv3.New(clientv3.Config{
Endpoints: []string{e.endpoint()},