public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Update error handling and logging for cache 

Previously we returned a low level file system error when checking for
a cached image. By adding a more human friendly log message and explicit
error handling we improve upon the user experience.
This commit is contained in:
Cole Wippern 2019-11-22 12:11:48 -08:00
parent d6f1ec1b37
commit a6e458caf1
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cache/cache.go vendored
View File

@ -28,7 +28,7 @@ import (
"github.com/GoogleContainerTools/kaniko/pkg/config" "github.com/GoogleContainerTools/kaniko/pkg/config"
"github.com/GoogleContainerTools/kaniko/pkg/creds" "github.com/GoogleContainerTools/kaniko/pkg/creds"
"github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/name"
"github.com/google/go-containerregistry/pkg/v1" v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/remote"
"github.com/google/go-containerregistry/pkg/v1/tarball" "github.com/google/go-containerregistry/pkg/v1/tarball"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -124,7 +124,8 @@ func LocalSource(opts *config.CacheOptions, cacheKey string) (v1.Image, error) {
fi, err := os.Stat(path) fi, err := os.Stat(path)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "getting file info") logrus.Debugf("No file found for cache key %v %v", cacheKey, err)
return nil, nil
} }
// A stale cache is a bad cache // A stale cache is a bad cache

31
pkg/util/image_util.go
View File

@ -74,15 +74,13 @@ func RetrieveSourceImage(stage config.KanikoStage, opts *config.KanikoOptions) (
// If so, look in the local cache before trying the remote registry // If so, look in the local cache before trying the remote registry
if opts.CacheDir != "" { if opts.CacheDir != "" {
cachedImage, err := cachedImage(opts, currentBaseName) cachedImage, err := cachedImage(opts, currentBaseName)
if cachedImage != nil { if err != nil {
logrus.Errorf("Error while retrieving image from cache: %v %v", currentBaseName, err)
} else if cachedImage != nil {
return cachedImage, nil return cachedImage, nil
} }
if err != nil {
logrus.Infof("Error while retrieving image from cache: %v", err)
} }
} logrus.Infof("Image %v not found in cache", currentBaseName)
// Otherwise, initialize image as usual // Otherwise, initialize image as usual
return RetrieveRemoteImage(currentBaseName, opts) return RetrieveRemoteImage(currentBaseName, opts)
} }
@ -93,13 +91,23 @@ func tarballImage(index int) (v1.Image, error) {
return tarball.ImageFromPath(tarPath, nil) return tarball.ImageFromPath(tarPath, nil)
} }
// Retrieves the manifest for the specified image from the specified registry
func remoteImage(image string, opts *config.KanikoOptions) (v1.Image, error) { func remoteImage(image string, opts *config.KanikoOptions) (v1.Image, error) {
logrus.Infof("Downloading base image %s", image) logrus.Infof("Retrieving image manifest %s", image)
ref, err := name.ParseReference(image, name.WeakValidation) ref, err := name.ParseReference(image, name.WeakValidation)
if err != nil { if err != nil {
return nil, err return nil, err
} }
rOpts, err := prepareRemoteRequest(ref, opts)
if err != nil {
return nil, err
}
return remote.Image(ref, rOpts...)
}
func prepareRemoteRequest(ref name.Reference, opts *config.KanikoOptions) ([]remote.Option, error) {
registryName := ref.Context().RegistryStr() registryName := ref.Context().RegistryStr()
if opts.InsecurePull || opts.InsecureRegistries.Contains(registryName) { if opts.InsecurePull || opts.InsecureRegistries.Contains(registryName) {
newReg, err := name.NewRegistry(registryName, name.WeakValidation, name.Insecure) newReg, err := name.NewRegistry(registryName, name.WeakValidation, name.Insecure)
@ -122,8 +130,7 @@ func remoteImage(image string, opts *config.KanikoOptions) (v1.Image, error) {
InsecureSkipVerify: true, InsecureSkipVerify: true,
} }
} }
return []remote.Option{remote.WithTransport(tr), remote.WithAuthFromKeychain(creds.GetKeychain())}, nil
return remote.Image(ref, remote.WithTransport(tr), remote.WithAuthFromKeychain(creds.GetKeychain()))
} }
func cachedImage(opts *config.KanikoOptions, image string) (v1.Image, error) { func cachedImage(opts *config.KanikoOptions, image string) (v1.Image, error) {
@ -136,18 +143,16 @@ func cachedImage(opts *config.KanikoOptions, image string) (v1.Image, error) {
if d, ok := ref.(name.Digest); ok { if d, ok := ref.(name.Digest); ok {
cacheKey = d.DigestStr() cacheKey = d.DigestStr()
} else { } else {
img, err := remoteImage(image, opts) image, err := remoteImage(image, opts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
d, err := img.Digest() d, err := image.Digest()
if err != nil { if err != nil {
return nil, err return nil, err
} }
cacheKey = d.String() cacheKey = d.String()
} }
return cache.LocalSource(&opts.CacheOptions, cacheKey) return cache.LocalSource(&opts.CacheOptions, cacheKey)
} }