From 079d4e52c24fa832e1f41f5b73f4078d8a441541 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 29 Oct 2024 12:32:03 -0400 Subject: [PATCH] Fix kubeadm etcd client interface --- cmd/kubeadm/app/util/etcd/etcd.go | 2 +- cmd/kubeadm/app/util/etcd/etcd_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/util/etcd/etcd.go b/cmd/kubeadm/app/util/etcd/etcd.go index 8dba40b85d1..36be2926a5a 100644 --- a/cmd/kubeadm/app/util/etcd/etcd.go +++ b/cmd/kubeadm/app/util/etcd/etcd.go @@ -71,7 +71,7 @@ type etcdClient interface { Endpoints() []string // MemberList lists the current cluster membership. - MemberList(ctx context.Context) (*clientv3.MemberListResponse, error) + MemberList(ctx context.Context, opts ...clientv3.OpOption) (*clientv3.MemberListResponse, error) // MemberAdd adds a new member into the cluster. MemberAdd(ctx context.Context, peerAddrs []string) (*clientv3.MemberAddResponse, error) diff --git a/cmd/kubeadm/app/util/etcd/etcd_test.go b/cmd/kubeadm/app/util/etcd/etcd_test.go index cbdba0f2955..c51cb516a0b 100644 --- a/cmd/kubeadm/app/util/etcd/etcd_test.go +++ b/cmd/kubeadm/app/util/etcd/etcd_test.go @@ -28,6 +28,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" clientv3 "go.etcd.io/etcd/client/v3" + apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" clientsetfake "k8s.io/client-go/kubernetes/fake" @@ -57,7 +58,7 @@ func (f *fakeEtcdClient) Endpoints() []string { } // MemberList lists the current cluster membership. -func (f *fakeEtcdClient) MemberList(_ context.Context) (*clientv3.MemberListResponse, error) { +func (f *fakeEtcdClient) MemberList(_ context.Context, _ ...clientv3.OpOption) (*clientv3.MemberListResponse, error) { return &clientv3.MemberListResponse{ Members: f.members, }, nil