rolling-update: restore 5s delay between pod eviction retries - #18641
Merged
kubernetes-prow[bot] merged 1 commit intoJul 30, 2026
Merged
Conversation
upodroid
approved these changes
Jul 30, 2026
Member
Author
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hakman, upodroid The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
kubernetes-prow Bot
added a commit
that referenced
this pull request
Jul 30, 2026
…-upstream-release-1.36 Automated cherry pick of #18641: rolling-update: restore 5s delay between pod eviction retries
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
kubectl v0.35 made the delay between pod eviction retries a caller-supplied field,
Helper.EvictErrorRetryDelay, instead of a hardcoded 5s (kubernetes/kubernetes#133461). Since kOps does not set it, draining a node with a PDB-blocked pod retries evictions in a tight loop with no delay, spammingwill retry after 0smessages and hammering the eviction API until the PDB allows the eviction./cc @rifelpet @ameukam @upodroid