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 #53167 upstream release 1.7 #53748

Merged
merged 1 commit into from
Oct 13, 2017
Merged

Automated cherry pick of #53167 upstream release 1.7 #53748

merged 1 commit into from
Oct 13, 2017

Conversation

dashpole
Copy link
Contributor

@dashpole dashpole commented Oct 11, 2017 •
edited

Cherrypick of #53167 to the 1.7 branch

/assign @wojtek-t

BugFix: Exited containers are not Garbage Collected by the kubelet while the pod is running

@k8s-ci-robot
Copy link
Contributor

@dashpole: Adding do-not-merge/release-note-label-needed because the release note process has not been followed.

One of the following labels is required "release-note", "release-note-action-required", or "release-note-none".
Please see: https://github.com/kubernetes/community/blob/master/contributors/devel/pull-requests.md#write-release-notes-if-needed.

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.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed 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 Oct 11, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Oct 11, 2017
@wojtek-t wojtek-t added this to the v1.7 milestone Oct 12, 2017
@wojtek-t wojtek-t added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Oct 12, 2017
@wojtek-t
Copy link
Member

@yujuhong - can you please review and LGTM it?

@dashpole
Copy link
Contributor Author

dashpole commented Oct 12, 2017 •
edited

This contains some changes from #50350 as well.
Namely:
The change from using isPodDeleted to IsPodDeleted()

This means we will garbage collect pods that have the deletion timestamp set, and where all containers have exited.

@wojtek-t
Copy link
Member

@yujuhong @dchen1107 - friendly ping for review this cherrypick

@yujuhong
Copy link
Contributor

This means we will garbage collect pods that have the deletion timestamp set, and where all containers have exited.

This is a bigger change than fixing the original bug. Can we not introduce this behavior for the patch?

@dashpole
Copy link
Contributor Author

sure. Ill post an update

@dashpole dashpole force-pushed the automated-cherry-pick-of-#53167-upstream-release-1.7 branch from 645b5b5 to db8e09c Compare October 13, 2017 16:47
@dashpole dashpole force-pushed the automated-cherry-pick-of-#53167-upstream-release-1.7 branch from db8e09c to 17a72be Compare October 13, 2017 16:50
@dashpole
Copy link
Contributor Author

@yujuhong I reverted the change in determining if a pod is deleted. This should be the minimal change now.

@yujuhong
Copy link
Contributor

/lgtm

Thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 13, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dashpole, yujuhong

Associated issue: 53167

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 13, 2017
@dashpole
Copy link
Contributor Author

/test pull-kubernetes-unit

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 3e734c4 into kubernetes:release-1.7 Oct 13, 2017
@dashpole dashpole deleted the automated-cherry-pick-of-#53167-upstream-release-1.7 branch January 15, 2019 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yujuhong yujuhong

@wojtek-t wojtek-t

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dashpole @k8s-ci-robot @wojtek-t @yujuhong @k8s-github-robot