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.

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

Fix kuberuntime GetPods. #46121

Merged
merged 1 commit into from May 20, 2017
Merged

Fix kuberuntime GetPods. #46121

merged 1 commit into from May 20, 2017

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented May 19, 2017 •
edited by enisoc

The ImageID is not populated from GetPods in kuberuntime.

Image garbage collector is using this field, https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/images/image_gc_manager.go#L204.

Without this fix, image garbage collector will try to garbage collect all images every time. Because docker will not allow that, it should be fine. However, I'm not sure whether the unnecessary remove will cause any problem, e.g. overload docker image management system and make docker hang.

@dchen1107 @yujuhong @feiskyer Do you think we should cherry-pick this?

Kubelet: Fix image garbage collector attempting to remove in-use images.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 19, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels May 19, 2017
@Random-Liu Random-Liu assigned yujuhong and unassigned resouer and tmrts May 19, 2017
@Random-Liu Random-Liu added release-note-none Denotes a PR that doesn't merit a release note. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed release-note-label-needed labels May 19, 2017
@yujuhong
Copy link
Contributor

yujuhong commented May 19, 2017 •
edited

LGTM. Waiting for the unit test.

Let's cherrypick this.

@yujuhong yujuhong added this to the v1.6 milestone May 19, 2017
@yujuhong yujuhong added release-note Denotes a PR that will be considered when it comes time to generate release notes. cherrypick-candidate and removed release-note-none Denotes a PR that doesn't merit a release note. labels May 19, 2017
@yujuhong yujuhong mentioned this pull request May 19, 2017
Closed
@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 19, 2017
@Random-Liu
Copy link
Member Author

@k8s-bot gce etcd3 e2e test this

@yujuhong
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Random-Liu, yujuhong

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
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@yujuhong
Copy link
Contributor

@k8s-bot pull-kubernetes-federation-e2e-gce test this

@Random-Liu
Copy link
Member Author

@k8s-bot pull-kubernetes-federation-e2e-gce test this

@feiskyer
Copy link
Member

LGTM. Let's cherry pick it to 1.6 branch.

@yujuhong
Copy link
Contributor

@k8s-bot pull-kubernetes-federation-e2e-gce test this

@k8s-ci-robot
Copy link
Contributor

@Random-Liu: The following test(s) failed:

Test name Commit Details Rerun command
pull-kubernetes-federation-e2e-gce 4935e11 link @k8s-bot pull-kubernetes-federation-e2e-gce test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 45996, 46121, 45707, 46011, 45564)

@k8s-github-robot k8s-github-robot merged commit 1c8d255 into kubernetes:master May 20, 2017
@Random-Liu Random-Liu deleted the fix-kuberuntime-getpods branch May 22, 2017 21:04
@Random-Liu Random-Liu mentioned this pull request May 22, 2017
Merged
@derekwaynecarr
Copy link
Member

@sjenning another pick when you have a chance.

k8s-github-robot pushed a commit that referenced this pull request May 23, 2017
Merge pull request #46251 from Random-Liu/automated-cherry-pick-of-#4…
37b7193 
…6121-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #46121

Cherry pick of #46121 on release-1.6.

#46121: Fix kuberuntime GetPods.
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.6" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@sjenning sjenning mentioned this pull request May 23, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhangxiaoyu-zidif zhangxiaoyu-zidif zhangxiaoyu-zidif approved these changes

Assignees

@yujuhong yujuhong

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. 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. sig/node Categorizes an issue or PR as relevant to SIG Node. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@Random-Liu @yujuhong @k8s-github-robot @feiskyer @k8s-ci-robot @derekwaynecarr @k8s-cherrypick-bot @zhangxiaoyu-zidif @resouer @tmrts