-
Notifications
You must be signed in to change notification settings - Fork 40k
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
Removing images with multiple tags #29316
Removing images with multiple tags #29316
Conversation
10bd67c
to
c44df3c
Compare
Looks good to me 👍 |
@@ -45,7 +45,7 @@ import ( | |||
func verifyCalls(t *testing.T, fakeDocker *FakeDockerClient, calls []string) { | |||
fakeDocker.Lock() | |||
defer fakeDocker.Unlock() | |||
verifyStringArrayEquals(t, fakeDocker.called, calls) | |||
verifyStringArrayEquals(t, fakeDocker.getCalledNames(), calls) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change this to use AssertCalls
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
LGTM with a nit. |
c44df3c
to
e25da21
Compare
LGTM. Feel free to apply the label after the test passes. :) |
GCE e2e build/test passed for commit e25da21. |
Bumped to P0 to be cherry-picked to 1.3 |
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
GCE e2e build/test passed for commit e25da21. |
Automatic merge from submit-queue |
Automatic merge from submit-queue CRI: Image pullable support in dockershim For #33189. The new test `ImageID should be set to the manifest digest (from RepoDigests) when available` introduced in #33014 is failing, because: 1) `docker-pullable://` conversion is not supported in dockershim; 2) `kuberuntime` and `dockershim` is using `ListImages with image name filter` to check whether image presents. However, `ListImages` doesn't support filter with `digest`. This PR: 1) Change `kuberuntime.IsImagePresent` to use `runtime.ImageStatus` and `dockershim.InspectImage` instead. ***Notice an API change: `ImageStatus` should return `(nil, nil)` for non-existing image.*** 2) Add `docker-pullable://` support. 3) Fix `RemoveImage` in dockershim #29316. I've tried myself, the test can pass now. @yujuhong @feiskyer @yifan-gu /cc @kubernetes/sig-node
…ick-of-#29316-upstream-release-1.3 Automatic merge from submit-queue Automated cherry pick of kubernetes#29316 Cherry pick of kubernetes#29316 on release-1.3.
If an image has multiple tags, we need to remove all the tags in order to make docker image removing successful.
#28491