Handle edge case as described in issue #328 #335
Conversation
This file contains 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
4609e3c
to
b10e0d9
Compare
unmarshall
requested changes
Nov 15, 2024
| var collectiveError error | ||
| for _, machineDeployment := range machineDeployments { | ||
| // ignore the machine deployment if it is in rolling update | ||
| if !isRollingUpdateFinished(machineDeployment) { |
There was a problem hiding this comment.
What happens when a machine deployment is paused/frozen?
| if machine.Status.CurrentStatus.Phase == v1alpha1.MachineTerminating || machine.Status.CurrentStatus.Phase == v1alpha1.MachineFailed { | ||
| continue | ||
| } | ||
| if machine.Annotations != nil && machine.Annotations[machinePriorityAnnotation] != defaultPriorityValue { |
There was a problem hiding this comment.
Instead use:
if machine.Annotations != nil && machine.Annotations[machinePriorityAnnotation] == 1 {
annotatedMachines = append(annotatedMachines, machine)
}And maybe you can create a constant for 1 to give it a semantically meaningful name.
There was a problem hiding this comment.
Please use annotVal, ok := machine.Annotations[machinePriorityAnnotation] in map to avoid possible panic.
| collectiveError = errors.Join(collectiveError, err) | ||
| continue | ||
| } | ||
| var annotatedMachines []*v1alpha1.Machine |
There was a problem hiding this comment.
can you instead use machinesMarkedForDeletion instead of annotatedMachines?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
This PR modifies the
Refreshmethod of CA to reset the priority annotation on the machine objects only if the number of annotated machines is more than desired. The desired count istotalMachines - mcd.Spec.Replicas.TerminatingandFailedmachines are excluded while calculating the total number of annotated machines.Which issue(s) this PR fixes:
Fixes #328
Special notes for your reviewer:
Release note: