Skip to content

Commit e7b9ffa

Browse files
Drop MemberUpdate from etcd client in KCP
1 parent c0cf7c6 commit e7b9ffa

File tree

3 files changed

+1
-35
lines changed

3 files changed

+1
-35
lines changed

controlplane/kubeadm/internal/etcd/etcd.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ type etcd interface {
4444
Endpoints() []string
4545
MemberList(ctx context.Context) (*clientv3.MemberListResponse, error)
4646
MemberRemove(ctx context.Context, id uint64) (*clientv3.MemberRemoveResponse, error)
47-
MemberUpdate(ctx context.Context, id uint64, peerURLs []string) (*clientv3.MemberUpdateResponse, error)
4847
MoveLeader(ctx context.Context, id uint64) (*clientv3.MoveLeaderResponse, error)
4948
Status(ctx context.Context, endpoint string) (*clientv3.StatusResponse, error)
5049
}
@@ -256,24 +255,6 @@ func (c *Client) RemoveMember(ctx context.Context, id uint64) error {
256255
return errors.Wrapf(err, "failed to remove member: %v", id)
257256
}
258257

259-
// UpdateMemberPeerURLs updates the list of peer URLs.
260-
func (c *Client) UpdateMemberPeerURLs(ctx context.Context, id uint64, peerURLs []string) ([]*Member, error) {
261-
ctx, cancel := context.WithTimeout(ctx, c.CallTimeout)
262-
defer cancel()
263-
264-
response, err := c.EtcdClient.MemberUpdate(ctx, id, peerURLs)
265-
if err != nil {
266-
return nil, errors.Wrapf(err, "failed to update etcd member %v's peer list to %+v", id, peerURLs)
267-
}
268-
269-
members := make([]*Member, 0, len(response.Members))
270-
for _, m := range response.Members {
271-
members = append(members, pbMemberToMember(m))
272-
}
273-
274-
return members, nil
275-
}
276-
277258
// Alarms retrieves all alarms on a cluster.
278259
func (c *Client) Alarms(ctx context.Context) ([]MemberAlarm, error) {
279260
ctx, cancel := context.WithTimeout(ctx, c.CallTimeout)

controlplane/kubeadm/internal/etcd/etcd_test.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,7 @@ func TestEtcdMembers_WithSuccess(t *testing.T) {
7474
{ID: 1234, Name: "foo", PeerURLs: []string{"https://1.2.3.4:2000"}},
7575
},
7676
},
77-
MoveLeaderResponse: &clientv3.MoveLeaderResponse{},
78-
MemberUpdateResponse: &clientv3.MemberUpdateResponse{
79-
Header: &etcdserverpb.ResponseHeader{},
80-
Members: []*etcdserverpb.Member{
81-
{ID: 1234, Name: "foo", PeerURLs: []string{"https://1.2.3.4:2000", "https://4.5.6.7:2000"}},
82-
},
83-
},
77+
MoveLeaderResponse: &clientv3.MoveLeaderResponse{},
8478
MemberRemoveResponse: &clientv3.MemberRemoveResponse{},
8579
AlarmResponse: &clientv3.AlarmResponse{},
8680
StatusResponse: &clientv3.StatusResponse{},
@@ -98,9 +92,4 @@ func TestEtcdMembers_WithSuccess(t *testing.T) {
9892

9993
err = client.RemoveMember(ctx, 1234)
10094
g.Expect(err).ToNot(HaveOccurred())
101-
102-
updatedMembers, err := client.UpdateMemberPeerURLs(ctx, 1234, []string{"https://4.5.6.7:2000"})
103-
g.Expect(err).ToNot(HaveOccurred())
104-
g.Expect(updatedMembers[0].PeerURLs).To(HaveLen(2))
105-
g.Expect(updatedMembers[0].PeerURLs).To(Equal([]string{"https://1.2.3.4:2000", "https://4.5.6.7:2000"}))
10695
}

controlplane/kubeadm/internal/etcd/fake/client.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ type FakeEtcdClient struct { //nolint:revive
2828
EtcdEndpoints []string
2929
MemberListResponse *clientv3.MemberListResponse
3030
MemberRemoveResponse *clientv3.MemberRemoveResponse
31-
MemberUpdateResponse *clientv3.MemberUpdateResponse
3231
MoveLeaderResponse *clientv3.MoveLeaderResponse
3332
StatusResponse *clientv3.StatusResponse
3433
ErrorResponse error
@@ -60,9 +59,6 @@ func (c *FakeEtcdClient) MemberRemove(_ context.Context, i uint64) (*clientv3.Me
6059
c.RemovedMember = i
6160
return c.MemberRemoveResponse, c.ErrorResponse
6261
}
63-
func (c *FakeEtcdClient) MemberUpdate(_ context.Context, _ uint64, _ []string) (*clientv3.MemberUpdateResponse, error) {
64-
return c.MemberUpdateResponse, c.ErrorResponse
65-
}
6662
func (c *FakeEtcdClient) Status(_ context.Context, _ string) (*clientv3.StatusResponse, error) {
6763
return c.StatusResponse, nil
6864
}

0 commit comments

Comments
 (0)