Skip to content

Skip machines in InPlaceUpdating phase during machine set transfer to prevent update phase failures #1020

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
aaronfern merged 3 commits into from
Jul 23, 2025
Merged

Skip machines in InPlaceUpdating phase during machine set transfer to prevent update phase failures #1020

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
4a34a72
Minor logging improvement
acumino Jul 22, 2025
43d128d
If machine is in phase `InPlaceUpdating` it should not be moved to ne…
acumino Jul 22, 2025
334f6ff
Prevent negative value calculation
acumino Jul 22, 2025
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
Prev Previous commit
Next Next commit
If machine is in phase InPlaceUpdating it should not be moved to ne… 
…w machine set
  • Loading branch information
@acumino
acumino committed Jul 22, 2025
commit 43d128d7e5df9de99dc47e82ef884e0eeb7760a1
2 changes: 1 addition & 1 deletion pkg/controller/deployment_inplace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ func (dc *controller) transferMachinesFromOldToNewMachineSet(ctx context.Context
}

cond := getMachineCondition(oldMachine, v1alpha1.NodeInPlaceUpdate)
if isUpdateNotSuccessful(cond, node.Labels) {
if isUpdateNotSuccessful(cond, node.Labels) || oldMachine.Status.CurrentStatus.Phase == v1alpha1.MachineInPlaceUpdating {
continue
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/deployment_inplace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ var _ = Describe("deployment_inplace", func() {
controlMachineObjects = append(controlMachineObjects, oldMachineSet, newMachineSet)

machines := []*machinev1.Machine{}
machines = append(machines, newMachinesFromMachineSet(int(data.setup.oldMachineSetReplicas), oldMachineSet, &machinev1.MachineStatus{}, nil, map[string]string{"key": "value"})...)
machines = append(machines, newMachinesFromMachineSet(int(data.setup.oldMachineSetReplicas), oldMachineSet, &machinev1.MachineStatus{CurrentStatus: machinev1.CurrentStatus{Phase: machinev1.MachineInPlaceUpdateSuccessful}}, nil, map[string]string{"key": "value"})...)
machines = append(machines, newMachinesFromMachineSet(int(data.setup.newMachineSetReplicas), newMachineSet, &machinev1.MachineStatus{}, nil, nil)...)
machinesWithUpdateSuccessful := 0
for i := range machines {
Expand Down