github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: fix a bug that ImageExists check returns true when the image isn't in the local storage

Browse Source
This commit is contained in:
SataQiu 2024-07-11 22:42:40 +08:00
parent 5b49afa66b
commit 69a2bebc70
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/kubeadm/app/util/runtime/runtime.go
View File

@ -229,8 +229,15 @@ func pullImagesInParallelImpl(images []string, ifNotPresent bool,
func (runtime *CRIRuntime) ImageExists(image string) bool {
ctx, cancel := defaultContext()
defer cancel()
_, err := runtime.impl.ImageStatus(ctx, runtime.imageService, &runtimeapi.ImageSpec{Image: image}, false)
return err == nil
resp, err := runtime.impl.ImageStatus(ctx, runtime.imageService, &runtimeapi.ImageSpec{Image: image}, false)
if err != nil {
klog.Warningf("Failed to get image status, image: %q, error: %v", image, err)
return false
}
if resp == nil || resp.Image == nil {
return false
}
return true
}
// detectCRISocketImpl is separated out only for test purposes, DON'T call it directly, use DetectCRISocket instead

7
cmd/kubeadm/app/util/runtime/runtime_test.go
View File

@ -319,7 +319,12 @@ func TestImageExists(t *testing.T) {
prepare func(*fakeImpl)
}{
{
name: "valid",
name: "valid",
prepare: func(mock *fakeImpl) {
mock.ImageStatusReturns(&v1.ImageStatusResponse{
Image: &v1.Image{},
}, nil)
},
expected: true,
},
{