Fix drain logic when skipNodesWithCustomControllerPods=false, set NodeDeleteOptions correctly #5653
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 type of PR is this?
/kind fix
What this PR does / why we need it:
In drain logic the
isDaemonSet
variable is set outside of pod loop. It is not correctly changed when skipNodesWithCustomControllerPods=false, so if there is at least one DS pod on the node it can be drained. This is also non-deterministic as the slice of pods is passed in random order.Additionally the NodeDeleteOptions were not set in all appropriate places. Because of this some parts of the logic like empty candidate sorting always worked on skipNodesWithCustomControllerPods=false.
Original change: #5507