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

kubelet/rkt: add container/image gc for rkt. #14686

Merged
merged 1 commit into from Oct 7, 2015
Merged

kubelet/rkt: add container/image gc for rkt. #14686

merged 1 commit into from Oct 7, 2015

Conversation

yifan-gu
Copy link
Contributor

Not sure why the rkt container gc is disabled.
This PR reenables it. It also adds image gc.

/cc @dchen1107 @yujuhong

@yifan-gu yifan-gu mentioned this pull request Sep 28, 2015
Closed
15 tasks
@k8s-bot
Copy link

k8s-bot commented Sep 28, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@dchen1107
Copy link
Member

ok to test

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 28, 2015
@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-bot
Copy link

k8s-bot commented Sep 28, 2015

Unit, integration and GCE e2e test build/test passed for commit 07ed08ac3e9f11107c342308936ba08601b62c59.

yujuhong
yujuhong reviewed Sep 29, 2015
View reviewed changes
pkg/kubelet/rkt/rkt.go
// Duration to wait before expiring prepared pods.
defaultExpirePrepared = "1m"
defaultExpirePrepared = "0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why changing the periods to 0?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@yujuhong Just for testing, I changed so I can see the result soonner. Changed back.
btw, we should derive this period from gc policy's MinAge, but that requires the gc definition stuff to be moved to kubelet/container or other packages, not in the kubelet.

Copy link
Contributor

Choose a reason for hiding this comment

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

Moving the gc policy out kubelet sounds good to me.

@k8s-bot
Copy link

k8s-bot commented Sep 29, 2015

Unit, integration and GCE e2e test build/test passed for commit 6a328f75eaaa3f28c5659414610afac12e983216.

@yujuhong yujuhong added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed cla: yes labels Sep 29, 2015
@yifan-gu yifan-gu mentioned this pull request Oct 1, 2015
Merged
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 2, 2015
@yujuhong
Copy link
Contributor

yujuhong commented Oct 2, 2015

#14706 got merged first...need a rebase here.

@yifan-gu
Copy link
Contributor Author

yifan-gu commented Oct 2, 2015

Rebased

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 2, 2015
@yujuhong yujuhong added lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-merge and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Oct 2, 2015
@k8s-bot
Copy link

k8s-bot commented Oct 2, 2015

Unit, integration and GCE e2e test build/test passed for commit 71f98eea7a321631c53e07b5f0055ddbff6dcdb1.

@yujuhong
Copy link
Contributor

yujuhong commented Oct 5, 2015

Kicked off shippable again. Hope this time it'd pass

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 5, 2015
@yujuhong
Copy link
Contributor

yujuhong commented Oct 5, 2015

Oops...need to rebase again

@yifan-gu
Copy link
Contributor Author

yifan-gu commented Oct 5, 2015

rebased.

@k8s-bot
Copy link

k8s-bot commented Oct 5, 2015

Unit, integration and GCE e2e test build/test passed for commit b42d231.

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 5, 2015
@yujuhong yujuhong mentioned this pull request Oct 5, 2015
Merged
@k8s-github-robot
Copy link

LGTM was before last commit, removing LGTM

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 6, 2015
@yujuhong yujuhong added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 6, 2015
@k8s-github-robot
Copy link

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

@k8s-bot
Copy link

k8s-bot commented Oct 7, 2015

GCE e2e test build/test passed for commit b42d231.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Oct 7, 2015
Merge pull request #14686 from yifan-gu/rkt_gc
348f0ca 
Auto commit by PR queue bot
@k8s-github-robot k8s-github-robot merged commit 348f0ca into kubernetes:master Oct 7, 2015
@yifan-gu yifan-gu deleted the rkt_gc branch October 7, 2015 07:18
@yifan-gu yifan-gu mentioned this pull request Oct 7, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yujuhong yujuhong

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@yifan-gu @k8s-bot @dchen1107 @k8s-github-robot @yujuhong @googlebot