Fix scaling logic in reconcileNewMachineSetInPlace #1052
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gardener-robot
added
needs/review
aaronfern
reviewed
Dec 15, 2025
| } | ||
|
|
||
| if oldMachinesCount+newMachineSet.Spec.Replicas < deployment.Spec.Replicas { | ||
| // Scale up the new machine set to the maximum possible replicas. |
Member
There was a problem hiding this comment.
This term "maximum possible replicas" could be misleading. Maybe change it to say "deployment replicas"
|
|
||
| if oldMachinesCount+newMachineSet.Spec.Replicas < deployment.Spec.Replicas { | ||
| // Scale up the new machine set to the maximum possible replicas. | ||
| klog.V(3).Infof("scale up the new machine set %s by %d to %d replicas", newMachineSet.Name, (deployment.Spec.Replicas - (oldMachinesCount + newMachineSet.Spec.Replicas)), deployment.Spec.Replicas-oldMachinesCount) |
Member
There was a problem hiding this comment.
This log can be improved a bit. Can you update this to be like the following (feel free to instead add a log line you feel is better suited)
scaling up new machine set <name> from y to z (delta: x)
Member
There was a problem hiding this comment.
Please also assign the expression oldMachinesCount + newMachineSet.Spec.Replicas to variable desiredReplicas to avoid excessive repeat of this expression.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Adds a check to ensure the new machine set is scaled up when the combined replicas of old and new machine sets are less than the desired deployment replicas. This basically ensures that if a machine is deleted manually from the old machine sets, a new machine should be created in the new machine set with the updated configuration.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Release note: