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

[CRI] Continue remove image when can't find image id with ImageRef #45808

Merged
merged 1 commit into from
May 15, 2017
Merged

[CRI] Continue remove image when can't find image id with ImageRef #45808

merged 1 commit into from
May 15, 2017

Conversation

Crazykev
Copy link
Contributor

@Crazykev Crazykev commented May 15, 2017 •
edited

Signed-off-by: Crazykev crazykev@zju.edu.cn

What this PR does / why we need it:
Should try to remove imageRef as repo:tag when can't find it as imageID.
/cc @feiskyer @Random-Liu PTAL
also /cc @xlgao-zju @heartlock

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

Special notes for your reviewer:

Release note:

None

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 15, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @Crazykev. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

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 the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 15, 2017
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels May 15, 2017
@Crazykev Crazykev mentioned this pull request May 15, 2017
Merged
@k8s-github-robot k8s-github-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels May 15, 2017
feiskyer
feiskyer reviewed May 15, 2017
View reviewed changes
pkg/kubelet/dockershim/docker_image.go
@@ -101,8 +101,6 @@ func (ds *dockerService) RemoveImage(image *runtimeapi.ImageSpec) error {
}
}
return nil
} else if err != nil && libdocker.IsImageNotFoundError(err) {
Copy link
Member

Choose a reason for hiding this comment

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

It should return err if error is not ImageNotFoundError and not nil.

Also should add a comment for the reason: dockerclient.InspectImageByID doesn't work with digest and repoTags, it is safe to continue removing it since there is another check below.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@feiskyer THX~ Updated!

@Crazykev
continue remove image when can't find image id with ref
1369a26 
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 15, 2017
@feiskyer
Copy link
Member

@k8s-bot ok to test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 15, 2017
@feiskyer
Copy link
Member

/assign @yujuhong @Random-Liu

@feiskyer
Copy link
Member

/unassign @ncdc

@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 15, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Crazykev, 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 k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 15, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 45171, 43947, 45788, 45822, 45808)

@k8s-github-robot k8s-github-robot merged commit e119631 into kubernetes:master May 15, 2017
@Crazykev Crazykev deleted the quick-fix branch May 16, 2017 02:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feiskyer feiskyer feiskyer left review comments

Assignees

@feiskyer feiskyer

@Random-Liu Random-Liu

@yujuhong yujuhong

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Crazykev @k8s-ci-robot @feiskyer @yujuhong @k8s-github-robot @ncdc @Random-Liu