Skip to content

Commit 5aa05ae

Browse files
authored
Merge pull request #11446 from chrischdi/pr-kcp-etcd-member-names
🌱 KCP: handle members without name in MemberNames
2 parents 4827418 + d278c42 commit 5aa05ae

File tree

1 file changed

+8
-0
lines changed
  • controlplane/kubeadm/internal/etcd/util

1 file changed

+8
-0
lines changed

controlplane/kubeadm/internal/etcd/util/util.go

+8
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ limitations under the License.
1818
package util
1919

2020
import (
21+
"fmt"
22+
2123
"k8s.io/apimachinery/pkg/util/sets"
2224

2325
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/etcd"
@@ -34,9 +36,15 @@ func MemberForName(members []*etcd.Member, name string) *etcd.Member {
3436
}
3537

3638
// MemberNames returns a list of all the etcd member names.
39+
// Note: this function is specificially designed for MemberEqual and setting condition messages.
3740
func MemberNames(members []*etcd.Member) []string {
3841
names := make([]string, 0, len(members))
3942
for _, m := range members {
43+
// When adding a member the name may not yet be set.
44+
if m.Name == "" {
45+
names = append(names, fmt.Sprintf("name not set yet for member with id %d", m.ID))
46+
continue
47+
}
4048
names = append(names, m.Name)
4149
}
4250
return names

0 commit comments

Comments
 (0)