github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

CRI - updating fake_image_server.go to support Annotations in ImageSpec

Browse Source
This commit is contained in:
marosset 2020-04-10 17:24:53 +00:00
parent b81a418b2e
commit 348153d55a
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
staging/src/k8s.io/cri-api/pkg/apis/testing/fake_image_service.go
View File

@ -44,7 +44,20 @@ func (r *FakeImageService) SetFakeImages(images []string) {
r.Images = make(map[string]*runtimeapi.Image)
for _, image := range images {
r.Images[image] = r.makeFakeImage(image)
r.Images[image] = r.makeFakeImage(
&runtimeapi.ImageSpec{
Image: image,
Annotations: make(map[string]string)})
}
}
func (r *FakeImageService) SetFakeImagesWithAnnotations(imageSpecs []*runtimeapi.ImageSpec) {
r.Lock()
defer r.Unlock()
r.Images = make(map[string]*runtimeapi.Image)
for _, imageSpec := range imageSpecs {
r.Images[imageSpec.Image] = r.makeFakeImage(imageSpec)
}
}
@ -70,11 +83,12 @@ func NewFakeImageService() *FakeImageService {
}
}
func (r *FakeImageService) makeFakeImage(image string) *runtimeapi.Image {
func (r *FakeImageService) makeFakeImage(image *runtimeapi.ImageSpec) *runtimeapi.Image {
return &runtimeapi.Image{
Id: image,
Id: image.Image,
Size_: r.FakeImageSize,
RepoTags: []string{image},
Spec: image,
RepoTags: []string{image.Image},
}
}
@ -157,7 +171,7 @@ func (r *FakeImageService) PullImage(image *runtimeapi.ImageSpec, auth *runtimea
// image's name for easily making fake images.
imageID := image.Image
if _, ok := r.Images[imageID]; !ok {
r.Images[imageID] = r.makeFakeImage(image.Image)
r.Images[imageID] = r.makeFakeImage(image)
}
return imageID, nil