Skip to content

Commit

Permalink
Merge pull request #120011 from neolit123/automated-cherry-pick-of-#1…
Browse files Browse the repository at this point in the history
…19753-origin-release-1.27

Automated cherry pick of #119753: kubeadm: fix nil pointer when etcd member is already removed
  • Loading branch information
k8s-ci-robot committed Sep 6, 2023
2 parents 6769046 + 5d6af91 commit 87a8935
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions cmd/kubeadm/app/util/etcd/etcd.go
Expand Up @@ -362,8 +362,11 @@ func (c *Client) RemoveMember(id uint64) ([]Member, error) {

// Returns the updated list of etcd members
ret := []Member{}
for _, m := range resp.Members {
ret = append(ret, Member{Name: m.Name, PeerURL: m.PeerURLs[0]})
if resp != nil {
for _, m := range resp.Members {
ret = append(ret, Member{Name: m.Name, PeerURL: m.PeerURLs[0]})
}

}

return ret, nil
Expand Down

0 comments on commit 87a8935

Please sign in to comment.