Skip to content

fix(instanceset): normalize observed role names #10677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leon-ape merged 3 commits into from
Jul 22, 2026
Merged

fix(instanceset): normalize observed role names #10677

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca1905d
fix(instanceset2): normalize observed role names
leon-ape Jul 15, 2026
4bb46d4
Merge remote-tracking branch 'origin/main' into bugfix/instanceset2-r…
leon-ape Jul 22, 2026
ddcecf1
fix(instanceset2): normalize planner role priorities
leon-ape Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions pkg/controller/instanceset2/instance_util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,23 @@ func TestSortObjects(t *testing.T) {
}
}

func TestSortInstancesNormalizesObservedRoleName(t *testing.T) {
roles := []workloads.ReplicaRole{
{Name: "Follower", UpdatePriority: 1},
{Name: "Leader", UpdatePriority: 2},
}
priorityMap := composeRolePriorityMap(roles)
instances := []workloads.Instance{
{ObjectMeta: metav1.ObjectMeta{Name: "mysql-0"}, Status: workloads.InstanceStatus2{Role: "Follower"}},
{ObjectMeta: metav1.ObjectMeta{Name: "mysql-1"}, Status: workloads.InstanceStatus2{Role: "Leader"}},
}

sortInstances(instances, priorityMap, false)
Comment thread
leon-ape marked this conversation as resolved.
if got := instances[0].Name; got != "mysql-0" {
t.Fatalf("sorted instances = %s, want mysql-0", got)
}
}

func TestCopyAndMergeService(t *testing.T) {
oldSvc := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/instanceset2/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func sortInstancesByRole[T any](instances []T, instanceAt func(int) *workloads.I
}

func getInstanceRoleName(inst *workloads.Instance) string {
return inst.Status.Role
return strings.ToLower(inst.Status.Role)
Comment thread
leon-ape marked this conversation as resolved.
}

func composeRoleMap(its workloads.InstanceSet) map[string]workloads.ReplicaRole {
Expand Down
Loading