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

Revert "Merge pull request #92817 from kmala/kubelet" #97980

Merged
merged 1 commit into from Jan 13, 2021
Merged

Revert "Merge pull request #92817 from kmala/kubelet" #97980

merged 1 commit into from Jan 13, 2021

Conversation

SergeyKanzhelev
Copy link
Member

@SergeyKanzhelev SergeyKanzhelev commented Jan 12, 2021 •
edited by liggitt

This reverts commit 88512be, reversing
changes made to c3b888f.

What type of PR is this?

/kind bug
/sig node
/priority important-soon

What this PR does / why we need it:
This PR reverses a commit causing regression and slow pods termination. Sending it to master and will cherry-pick to 1.20. This is safest way to address it.

Which issue(s) this PR fixes:
Fixes #97288
re-opens #88543

Special notes for your reviewer:
It was discussed on SIG node today: https://docs.google.com/document/d/1Ne57gvidMEWXR70OxxnRkYquAoMpt56o75oZtg-OeBg/edit#heading=h.ppor9vdfef5g

Does this PR introduce a user-facing change?:

Fix the regression in 1.20 with the slow pods termination. Before this fix pods may take an additional time to terminate - up to one minute. Reversing the change that ensured that CNI resources cleaned up when the pod is removed on API server.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. sig/node Categorizes an issue or PR as relevant to SIG Node. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Jan 12, 2021
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jan 12, 2021
@ehashman
Copy link
Member

/triage accepted

@SergeyKanzhelev the commit seems to not be associated with your GH user, might need to redo it

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jan 12, 2021
@SergeyKanzhelev SergeyKanzhelev force-pushed the revertSandboxCheckInStatus branch 2 times, most recently from e763877 to 3da9d28 Compare January 12, 2021 22:17
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jan 12, 2021
@ehashman
Copy link
Member

/lgtm
assuming tests pass

/cc @mrunalp

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2021
@SergeyKanzhelev
Revert "Merge pull request kubernetes#92817 from kmala/kubelet"
4c9e96c 
This reverts commit 88512be, reversing
changes made to c3b888f.
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2021
@mrunalp
Copy link
Contributor

mrunalp commented Jan 12, 2021

Discussed in sig-node today and we decided to merge the revert. Thanks!

@mrunalp
Copy link
Contributor

mrunalp commented Jan 12, 2021

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mrunalp, SergeyKanzhelev

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 12, 2021
@rphillips
Copy link
Member

redoing the lgtm
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2021
@k8s-ci-robot k8s-ci-robot merged commit e0b2787 into kubernetes:master Jan 13, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jan 13, 2021
This was referenced Jan 13, 2021
Merged
Merged
@SergeyKanzhelev SergeyKanzhelev deleted the revertSandboxCheckInStatus branch January 13, 2021 19:28
@ehashman ehashman mentioned this pull request Jan 13, 2021
Merged
13 tasks
@github-actions github-actions bot mentioned this pull request Jan 19, 2021
Open
k8s-ci-robot added a commit that referenced this pull request Jan 19, 2021
@k8s-ci-robot
Merge pull request #97998 from ehashman/automated-cherry-pick-of-#979…
b86925b 
…80-upstream-release-1.20

Automated cherry pick of #97980: Revert "Merge pull request #92817 from kmala/kubelet"
@avalluri avalluri mentioned this pull request Mar 3, 2021
Closed
@astefanutti astefanutti mentioned this pull request Apr 30, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@odinuge odinuge Awaiting requested review from odinuge

@Random-Liu Random-Liu Awaiting requested review from Random-Liu

@mrunalp mrunalp Awaiting requested review from mrunalp

Assignees

@rphillips rphillips

@ehashman ehashman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. 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
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.

1.20 regression: pods failing to terminate
5 participants
@SergeyKanzhelev @k8s-ci-robot @ehashman @mrunalp @rphillips