DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Always lookup images in simplestreams

Browse source 
This change makes sure we always download the latest image from
simplestreams. We no longer copy labels from simplestreams so we need
to lookup the hash of the image against simplestreams. This means that
in airgapped environments, the operator will have to manually tag images
and use the tag name in favor of remote:image_name.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2022-07-16 13:47:17 +00:00
parent dede5cc465
commit 3da860eea6
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
runner/providers/lxd/images.go
View file

@ -113,8 +113,6 @@ func (i *image) copyImageFromRemote(remote config.LXDImageRemote, imageName stri
return nil, errors.Wrap(err, "waiting for image copy operation")
}
// We should now have the image locally. Force another query. This probably makes no sense,
// but this is done only once.
return image, nil
}
@ -134,13 +132,14 @@ func (i *image) EnsureImage(imageName string, imageType config.LXDImageType, arc
return nil, errors.Wrap(err, "parsing image name")
}
if img, err := i.getLocalImageByAlias(parsedName, imageType, arch, cli); err == nil {
if img, err := i.copyImageFromRemote(remote, parsedName, imageType, arch, cli); err == nil {
return img, nil
} else {
log.Printf("failed to fetch local image of type %v with name %s and arch %s: %s", imageType, parsedName, arch, err)
log.Printf("failed to fetch image of type %v with name %s and arch %s: %s", imageType, parsedName, arch, err)
}
img, err := i.copyImageFromRemote(remote, parsedName, imageType, arch, cli)
log.Printf("attempting to find %s for arch %s locally", parsedName, arch)
img, err := i.getLocalImageByAlias(parsedName, imageType, arch, cli)
if err != nil {
return nil, errors.Wrap(err, "fetching image")
}