Merge pull request #396 from ahrtr/remove_member_20240427

Fix the issue that an incorrect member may be removed

Author: k8s-ci-robot

etcd-manager/pkg/controller/etcdclusterstate.go

@@ -144,21 +144,21 @@ func (s *etcdClusterState) etcdAddMember(ctx context.Context, nodeInfo *protoetc
 	return nil, fmt.Errorf("unable to reach any cluster member, when trying to add new member %q", nodeInfo.PeerUrls)
 }
 
-func (s *etcdClusterState) etcdRemoveMember(ctx context.Context, member *etcdclient.EtcdProcessMember) error {
+func (s *etcdClusterState) etcdRemoveMember(ctx context.Context, nodeInfo *etcdclient.EtcdProcessMember) error {
 	for id, member := range s.members {
 		etcdClient, err := s.newEtcdClient(member)
 		if err != nil {
 			klog.Warningf("unable to build client for member %s: %v", member.Name, err)
 			continue
 		}
 
-		err = etcdClient.RemoveMember(ctx, member)
+		err = etcdClient.RemoveMember(ctx, nodeInfo)
 		etcdclient.LoggedClose(etcdClient)
 		if err != nil {
 			klog.Warningf("Remove member call failed on %s: %v", id, err)
 			continue
 		}
 		return nil
 	}
-	return fmt.Errorf("unable to reach any cluster member, when trying to remove member %s", member)
+	return fmt.Errorf("unable to reach any cluster member, when trying to remove member %s", nodeInfo)
 }