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 #103979: cpu manager: do not clean admitted pods from the state #104267

Merged
merged 3 commits into from
Aug 16, 2021
Merged

Automated cherry pick of #103979: cpu manager: do not clean admitted pods from the state #104267

merged 3 commits into from
Aug 16, 2021
+217 −11

Conversation

cynepco3hahue
Copy link

@cynepco3hahue cynepco3hahue commented Aug 10, 2021 •
edited by liggitt
Loading

Cherry pick of #103979 on release-1.22.

#103979: cpu manager: do not clean admitted pods from the state

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

Does this PR introduce a user-facing change?

Fixes a 1.22 regression in kubelet pod admission

Artyom Lukianov added 3 commits August 10, 2021 12:03
cpu manager: do not clean admitted pods from the state
be0fb3f 
Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
memory manager: do not clean admitted pods from the state
6712085 
Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
device manager: do not clean admitted pods from the state
b2acf31 
Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Aug 10, 2021
@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/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/kubelet labels Aug 10, 2021
@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Aug 10, 2021
@cynepco3hahue
Copy link
Author

/priority important-soon
/triage accepted

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Aug 10, 2021
@cynepco3hahue
Copy link
Author

/kind bug
/kind regression

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. kind/regression Categorizes issue or PR as related to a regression from a prior release. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 10, 2021
@cynepco3hahue
Copy link
Author

@klueska Can you please approve the cherry-pick?

@klueska
Copy link
Contributor

klueska commented Aug 10, 2021

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 10, 2021
@cynepco3hahue
Copy link
Author

@ehashman Hi, can you please approve the cherry-pick?

@ehashman
Copy link
Member

I can't approve, that's up to the release managers.

Upstream fix only merged a couple days ago, let's let this bake for a month before we backport.

@ialidzhikov
Copy link
Contributor

/cc @kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team August 12, 2021 12:08
@cpanato
Copy link
Member

cpanato commented Aug 16, 2021

@ehashman @ialidzhikov today is the CP deadline for 1.22.1 do you want CP to get in for this patch cycle or do you want to wait for the next one?
Asking because I saw your comment #104267 (comment)

@klueska
Copy link
Contributor

klueska commented Aug 16, 2021

We need this in 1.22.1

cpanato
cpanato approved these changes Aug 16, 2021
View reviewed changes
Copy link
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

from RelEng:
/lgtm

@cpanato cpanato added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 16, 2021
@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 Aug 16, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, cynepco3hahue, klueska

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

@ialidzhikov
Copy link
Contributor

/test pull-kubernetes-integration

1 similar comment
@ialidzhikov
Copy link
Contributor

ialidzhikov commented Aug 16, 2021 •
edited
Loading

/test pull-kubernetes-integration

@k8s-ci-robot k8s-ci-robot merged commit e31b552 into kubernetes:release-1.22 Aug 16, 2021
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Sep 9, 2023
@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

@cpanato cpanato cpanato approved these changes

@feiskyer feiskyer Awaiting requested review from feiskyer

@klueska klueska Awaiting requested review from klueska

Assignees

@klueska klueska

@cpanato cpanato

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet 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/bug Categorizes issue or PR as related to a bug. 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/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node: code and documentation PRs
Archived in project
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.
7 participants
@cynepco3hahue @klueska @ehashman @ialidzhikov @cpanato @k8s-ci-robot @liggitt