Skip to content

Commit 30d002d

Browse files
enxebreopenshift-merge-robot
authored andcommitted
UPSTREAM: <carry>: openshift: Sort machines before syncing
1 parent 04cf9ab commit 30d002d

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

pkg/controller/machineset/controller.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package machineset
1919
import (
2020
"context"
2121
"fmt"
22+
"sort"
2223
"strings"
2324
"sync"
2425
"time"
@@ -224,7 +225,8 @@ func (r *ReconcileMachineSet) reconcile(ctx context.Context, machineSet *machine
224225
}
225226

226227
// Filter out irrelevant machines (deleting/mismatch labels) and claim orphaned machines.
227-
filteredMachines := make([]*machinev1beta1.Machine, 0, len(allMachines.Items))
228+
var machineNames []string
229+
machineSetMachines := make(map[string]*machinev1beta1.Machine)
228230
for idx := range allMachines.Items {
229231
machine := &allMachines.Items[idx]
230232
if shouldExcludeMachine(machineSet, machine) {
@@ -238,8 +240,15 @@ func (r *ReconcileMachineSet) reconcile(ctx context.Context, machineSet *machine
238240
continue
239241
}
240242
}
243+
machineNames = append(machineNames, machine.Name)
244+
machineSetMachines[machine.Name] = machine
245+
}
246+
// sort the filteredMachines from the oldest to the youngest
247+
sort.Strings(machineNames)
241248

242-
filteredMachines = append(filteredMachines, machine)
249+
var filteredMachines []*machinev1beta1.Machine
250+
for _, machineName := range machineNames {
251+
filteredMachines = append(filteredMachines, machineSetMachines[machineName])
243252
}
244253

245254
syncErr := r.syncReplicas(machineSet, filteredMachines)

0 commit comments

Comments
 (0)