fix: display correct number of machines on dashboard

Rename members to machines to be clearer.
Display the correct member count.

Closes siderolabs/talos#7127.

Signed-off-by: Utku Ozdemir <utku.ozdemir@siderolabs.com>
This commit is contained in:
Utku Ozdemir 2023-04-26 11:08:36 +02:00
parent cad43f0ad3
commit b097efcde2
No known key found for this signature in database
GPG Key ID: 65933E76F0549B0D

View File

@ -22,9 +22,9 @@ type talosInfoData struct {
stage string stage string
ready string ready string
typ string typ string
numMembersText string numMachinesText string
numMembers int machineIDSet map[string]struct{}
} }
// TalosInfo represents the Talos info widget. // TalosInfo represents the Talos info widget.
@ -101,12 +101,12 @@ func (widget *TalosInfo) updateNodeData(data resourcedata.Data) {
} }
case *cluster.Member: case *cluster.Member:
if data.Deleted { if data.Deleted {
nodeData.numMembers-- delete(nodeData.machineIDSet, res.Metadata().ID())
} else { } else {
nodeData.numMembers++ nodeData.machineIDSet[res.Metadata().ID()] = struct{}{}
} }
nodeData.numMembersText = strconv.Itoa(nodeData.numMembers) nodeData.numMachinesText = strconv.Itoa(len(nodeData.machineIDSet))
} }
} }
@ -119,7 +119,8 @@ func (widget *TalosInfo) getOrCreateNodeData(node string) *talosInfoData {
stage: notAvailable, stage: notAvailable,
ready: notAvailable, ready: notAvailable,
typ: notAvailable, typ: notAvailable,
numMembersText: notAvailable, numMachinesText: notAvailable,
machineIDSet: make(map[string]struct{}),
} }
widget.nodeMap[node] = nodeData widget.nodeMap[node] = nodeData
@ -154,8 +155,8 @@ func (widget *TalosInfo) redraw() {
Value: data.typ, Value: data.typ,
}, },
{ {
Name: "MEMBERS", Name: "MACHINES",
Value: data.numMembersText, Value: data.numMachinesText,
}, },
}, },
} }