Automated cherry pick of #18641: rolling-update: restore 5s delay between pod eviction retries - #18643
Merged
kubernetes-prow[bot] merged 1 commit intoJul 30, 2026
Conversation
Member
Author
rifelpet
approved these changes
Jul 30, 2026
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rifelpet 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
merged commit Jul 30, 2026
6ec86cf
into
kubernetes:release-1.36
17 checks passed
social4hyq
pushed a commit
to social4hyq/homebrew-core
that referenced
this pull request
Sep 20, 2026
kops 1.36.2 Created-by: HarmonybrewBot Commit-by: HarmonybrewBot Merged-by: HarmonybrewBot Description: Created by `brew bump` --- Created with `brew bump-formula-pr`.<details> <summary>release notes</summary> <pre>## What's Changed * Automated cherry pick of #18636: azure: support terraform provider azurerm v5 by @hakman in kubernetes/kops#18637 * Automated cherry pick of #18638: Update hcloud-go/v2 to latest version (v2.47.0) by @hakman in kubernetes/kops#18639 * Automated cherry pick of #18641: rolling-update: restore 5s delay between pod eviction retries by @hakman in kubernetes/kops#18643 * Automated cherry pick of #18642: aws: do not set the primary network interface to "Unmanaged=yes" by @hakman in kubernetes/kops#18644 * Automated cherry pick of #18645: etcd-manager: compute kops-utils-cp image at use time by @hakman in kubernetes/kops#18646 * Automated cherry pick of #18649: aws: Default to AWS CCM v1.36.1 for all k8s versions by @rifelpet in kubernetes/kops#18652 * Automated cherry pick of #18657: fix(channels): only treat known ready conditions as health signals by @hakman in kubernetes/kops#18659 * Automated cherry pick of #18655: Generate EC2NodeClass block device mapping for root volume by @hakman in kubernetes/kops#18673 * Release 1.36.2 by @hakman in kubernetes/kops#18674 **Full Changelog**: https://github.com/kubernetes/kops/compare/v1.36.1...v1.36.2</pre> <p>View the full release notes at <a href="/sitelet?url=https%3A%2F%2Fgithub.com%2Fkubernetes%2Fkops%2Fpull%2F%253Ca%2520href%3D"https://github.com/kubernetes/kops/releases/tag/v1.36.2">https://github.com/kubernetes/kops/releases/tag/v1.36.2</a>.</p">https://github.com/kubernetes/kops/releases/tag/v1.36.2">https://github.com/kubernetes/kops/releases/tag/v1.36.2</a>.</p> </details> <hr> See merge request: Harmonybrew/homebrew-core!16183
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.
Cherry pick of #18641 on release-1.36.
#18641: rolling-update: restore 5s delay between pod eviction retries
For details on the cherry pick process, see the cherry pick requests page.
What type of PR is this?