downloader: do not error out if retrieving remote last-modified for cached images fails

norio-nomura · norio-nomura · commit 4b4a8e526015 · 2024-09-11T19:45:43.000+09:00
Signed-off-by: Norio Nomura &lt;norio.nomura@gmail.com&gt;
diff --git a/pkg/downloader/downloader.go b/pkg/downloader/downloader.go
@@ -241,7 +241,7 @@ func Download(ctx context.Context, local, remote string, opts ...Opt) (*Result,
 			}
 		} else {
 			if match, err := matchLastModified(ctx, shadTime, remote); err != nil {
-				return nil, err
+				logrus.WithError(err).Info("Failed to retrieve last-modified for cached digest-less image; using cached image.")
 			} else if match {
 				if err := copyLocal(ctx, localPath, shadData, ext, o.decompress, o.description, o.expectedDigest); err != nil {
 					return nil, err

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ func Download(ctx context.Context, local, remote string, opts ...Opt) (*Result,`
`241`	`241`	`}`
`242`	`242`	`} else {`
`243`	`243`	`if match, err := matchLastModified(ctx, shadTime, remote); err != nil {`
`244`		`- return nil, err`
	`244`	`+ logrus.WithError(err).Info("Failed to retrieve last-modified for cached digest-less image; using cached image.")`
`245`	`245`	`} else if match {`
`246`	`246`	`if err := copyLocal(ctx, localPath, shadData, ext, o.decompress, o.description, o.expectedDigest); err != nil {`
`247`	`247`	`return nil, err`