Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix run-image access check in restorer phase #1386

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Fix run-image access check in restorer phase #1386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/lifecycle/restorer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ func (r *restoreCmd) Exec() error {
}

if r.supportsRunImageExtension() && needsPulling(analyzedMD.RunImage) {
cmd.DefaultLogger.Debugf("Pulling run image metadata for %s...", runImageName)
runImage, err = r.pullSparse(runImageName)
cmd.DefaultLogger.Debugf("Pulling run image metadata for %s...", accessibleRunImage)
runImage, err = r.pullSparse(accessibleRunImage)
if err != nil {
return cmd.FailErr(err, fmt.Sprintf("pull run image %s", runImageName))
return cmd.FailErr(err, fmt.Sprintf("pull run image %s", accessibleRunImage))
}
// update analyzed metadata, even if we only needed to pull the image metadata, because
// the extender needs a digest reference in analyzed.toml,
Expand All @@ -150,9 +150,9 @@ func (r *restoreCmd) Exec() error {
} else if r.needsUpdating(analyzedMD.RunImage, group) {
cmd.DefaultLogger.Debugf("Updating run image info in analyzed metadata...")
h := image.NewHandler(r.docker, r.keychain, r.LayoutDir, r.UseLayout, r.InsecureRegistries)
runImage, err = h.InitImage(runImageName)
runImage, err = h.InitImage(accessibleRunImage)
if err != nil || !runImage.Found() {
return cmd.FailErr(err, fmt.Sprintf("get run image %s", runImageName))
return cmd.FailErr(err, fmt.Sprintf("get run image %s", accessibleRunImage))
}
if err = r.updateAnalyzedMD(&analyzedMD, runImage); err != nil {
return cmd.FailErr(err, "update analyzed metadata")
Expand Down
Loading