Skip to content

Fix scaling logic in reconcileNewMachineSetInPlace #1052

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
takoverflow merged 3 commits into from
Jan 8, 2026
Merged

Fix scaling logic in reconcileNewMachineSetInPlace #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71c1660
Fix scaling logic in reconcileNewMachineSetInPlace
acumino Nov 17, 2025
7cbd8d0
Address review
acumino Jan 5, 2026
5cdaa1f
Fix logic
acumino Jan 5, 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
8 changes: 8 additions & 0 deletions pkg/controller/deployment_inplace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,14 @@ func (dc *controller) reconcileNewMachineSetInPlace(ctx context.Context, oldMach
return scaled, err
}

totalReplicas := oldMachinesCount + newMachineSet.Spec.Replicas
if totalReplicas < deployment.Spec.Replicas {
// Scale up the new machine set to reach the desired replica count, considering old machines.
klog.V(3).Infof("scale up the new machine set %s from %d to %d replicas (delta: %d)", newMachineSet.Name, newMachineSet.Spec.Replicas, deployment.Spec.Replicas-oldMachinesCount, deployment.Spec.Replicas-totalReplicas)
scaled, _, err := dc.scaleMachineSetAndRecordEvent(ctx, newMachineSet, deployment.Spec.Replicas-oldMachinesCount, deployment)
return scaled, err
}

addedNewReplicasCount, err := dc.transferMachinesFromOldToNewMachineSet(ctx, oldMachineSets, newMachineSet, deployment)
if err != nil {
return false, fmt.Errorf("error while transferring machines from old to new machine set: %w", err)
Expand Down
10 changes: 10 additions & 0 deletions pkg/controller/deployment_inplace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,16 @@ var _ = Describe("deployment_inplace", func() {
scaled: true,
},
}),
Entry("scale up newMachineSet to max possible replicas when oldMachinesCount+newMachineSet.Spec.Replicas < deployment.Spec.Replicas", &data{
setup: setup{
oldMachineSetReplicas: 1,
newMachineSetReplicas: 1,
nodesWithUpdateSuccessful: 0,
},
expect: expect{
scaled: true,
},
}),
)
})

Expand Down
Loading