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

Fix:Image garbage collection is always disabled in kubelet in 1.11 #66051

Merged
merged 1 commit into from Jul 11, 2018

Conversation

@jiaxuanzhou
Copy link
Contributor

jiaxuanzhou commented Jul 11, 2018

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #66046

Special notes for your reviewer:
@yujuhong @derekwaynecarr
Release note:

Fix the bug where image garbage collection is disabled by mistake.
@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Jul 11, 2018

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 requested review from dchen1107 and mtaufen Jul 11, 2018

@jiaxuanzhou jiaxuanzhou force-pushed the jiaxuanzhou:imageGC branch from 26dcb99 to ca1bdc7 Jul 11, 2018

// when the high threshold is set to 100, stub the image GC manager
if kl.kubeletConfiguration.ImageGCHighThresholdPercent == 100 {
glog.V(2).Infof("ImageGCHighThresholdPercent is set 100, Disable image GC")
go func() { stopChan <- struct{}{} }()
go func() { close(stopChan) }()

This comment has been minimized.

@yujuhong

yujuhong Jul 11, 2018

Member

Why not just returning here?

This comment has been minimized.

@jiaxuanzhou

jiaxuanzhou Jul 11, 2018

Author Contributor

modified

@yujuhong

This comment has been minimized.

Copy link
Member

yujuhong commented Jul 11, 2018

Please add a release note.

@yujuhong

This comment has been minimized.

Copy link
Member

yujuhong commented Jul 11, 2018

/cc @foxish, the 1.11 patch release manager.
This should be included in 1.11.1

@yujuhong

This comment has been minimized.

Copy link
Member

yujuhong commented Jul 11, 2018

/ok-to-test

@dashpole, do we have any image gc tests?

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Jul 11, 2018

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@jiaxuanzhou @yujuhong

Pull Request Labels
  • sig/node: Pull Request will be escalated to these SIGs if needed.
  • priority/critical-urgent: Never automatically move pull request out of a release milestone; continually escalate to contributor and SIG through all available channels.
  • kind/bug: Fixes a bug discovered during the current release.
Help
@yujuhong

This comment has been minimized.

Copy link
Member

yujuhong commented Jul 11, 2018

/lgtm
/retest

@k8s-ci-robot k8s-ci-robot added the lgtm label Jul 11, 2018

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Jul 11, 2018

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@foxish

This comment has been minimized.

Copy link
Member

foxish commented Jul 11, 2018

ack, let's cherrypick this into 1.11.1

@jiaxuanzhou

This comment has been minimized.

Copy link
Contributor Author

jiaxuanzhou commented Jul 11, 2018

/test pull-kubernetes-e2e-gce

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Jul 11, 2018

Automatic merge from submit-queue (batch tested with PRs 66051, 66049). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 6c6449c into kubernetes:master Jul 11, 2018

17 checks passed

Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation jiaxuanzhou authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Job succeeded.
Details
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details

@jiaxuanzhou jiaxuanzhou deleted the jiaxuanzhou:imageGC branch Jul 11, 2018

@yujuhong

This comment has been minimized.

Copy link
Member

yujuhong commented Jul 11, 2018

@jianglingxia cold you please create PRs to cherrypick the fix to 1.11? Thanks.

k8s-github-robot pushed a commit that referenced this pull request Jul 12, 2018

Kubernetes Submit Queue
Merge pull request #66079 from yujuhong/automated-cherry-pick-of-#660…
…51-upstream-release-1.11

Automatic merge from submit-queue.

Automated cherry pick of #66051: fix bug for garbage collection

Cherry pick of #66051 on release-1.11.

#66051: fix bug for garbage collection

```release-note
Fix the bug where image garbage collection is disabled by mistake.
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.