Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #114770: Fix clearing rate limiter in disruption controller #114780

Merged
merged 1 commit into from Jan 4, 2023
Merged

Automated cherry pick of #114770: Fix clearing rate limiter in disruption controller #114780

merged 1 commit into from Jan 4, 2023

Conversation

mimowo
Copy link
Contributor

@mimowo mimowo commented Jan 3, 2023 •
edited by liggitt

Cherry pick of #114770 on release-1.26.

#114770: Fix clearing rate limiter in disruption controller

For details on the cherry pick process, see the cherry pick requests page.

Fix a regression in default 1.26 configurations with the PodDisruptionConditions feature enabled clearing of rate-limiter for the queue of checks for cleaning stale pod disruption conditions. The bug could result in the PDB synchronization updates firing too often or the pod disruption cleanups taking too long to happen.

@k8s-ci-robot k8s-ci-robot added this to the v1.26 milestone Jan 3, 2023
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jan 3, 2023
@mimowo
Copy link
Contributor Author

mimowo commented Jan 3, 2023

/assign @alculquicondor

@k8s-ci-robot k8s-ci-robot added sig/apps Categorizes an issue or PR as relevant to SIG Apps. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jan 3, 2023
@mimowo
Copy link
Contributor Author

mimowo commented Jan 3, 2023

/assign @soltysh

soltysh
soltysh approved these changes Jan 4, 2023
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 4, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e658349b2bf017ec1a0b703041d401af10d204aa

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 4, 2023
@soltysh
Copy link
Contributor

soltysh commented Jan 4, 2023

/kind regression
/triage accepted
/priority critical-urgent

@k8s-ci-robot k8s-ci-robot added kind/regression Categorizes issue or PR as related to a regression from a prior release. triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jan 4, 2023
@mimowo
Copy link
Contributor Author

mimowo commented Jan 4, 2023

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team January 4, 2023 08:44
@xmudrii
Copy link
Member

xmudrii commented Jan 4, 2023

@mimowo @soltysh Is this affecting only 1.26?

@mimowo
Copy link
Contributor Author

mimowo commented Jan 4, 2023 •
edited

Is this affecting only 1.26?

It also affects 1.25, @xmudrii should I prepare an analogous PR?

@xmudrii
Copy link
Member

xmudrii commented Jan 4, 2023

@mimowo Yes, please.

@mimowo
Copy link
Contributor Author

mimowo commented Jan 4, 2023

@mimowo Yes, please.

There you go: #114808

@mimowo
Copy link
Contributor Author

mimowo commented Jan 4, 2023 •
edited

@mimowo Yes, please.

There you go: #114808

Actually, I'm in a doubt after a second thought.

The code wasn't protected by a feature gate in 1.25, however, it was indirectly protected as it would only activate if the pod disruption condition was added (https://github.com/kubernetes/kubernetes/blob/release-1.25/pkg/controller/disruption/disruption.go#L487-L489), and adding pod disruption conditions was alpha in 1.25. @alculquicondor @soltysh WDYT?

Closing the other PR for 1.25 for now.

@mimowo mimowo mentioned this pull request Jan 4, 2023
Closed
@soltysh
Copy link
Contributor

soltysh commented Jan 4, 2023

The code wasn't protected by a feature gate in 1.25, however, it was indirectly protected as it would only activate if the pod disruption condition was added (https://github.com/kubernetes/kubernetes/blob/release-1.25/pkg/controller/disruption/disruption.go#L487-L489), and adding pod disruption conditions was alpha in 1.25. @alculquicondor @soltysh WDYT?

Based on general guidelines for cherry-picks 1.25 wouldn't have to be fixed in this case. So I'm inclined to say to not to fix it there.

xmudrii
xmudrii approved these changes Jan 4, 2023
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@xmudrii xmudrii added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 4, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 4, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mimowo, soltysh, xmudrii

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit cae683a into kubernetes:release-1.26 Jan 4, 2023
@mimowo mimowo deleted the automated-cherry-pick-of-#114770-upstream-release-1.26 branch March 18, 2023 18:37
@liggitt liggitt added the kind/feature Categorizes issue or PR as related to a new feature. label Sep 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@xmudrii xmudrii xmudrii approved these changes

@mortent mortent Awaiting requested review from mortent

Assignees

@soltysh soltysh

@alculquicondor alculquicondor

@xmudrii xmudrii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. kind/regression Categorizes issue or PR as related to a regression from a prior release. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/apps Categorizes an issue or PR as relevant to SIG Apps. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.26
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@mimowo @k8s-ci-robot @soltysh @xmudrii @liggitt @alculquicondor