Merge pull request #9161 from openshift-cherrypick-robot/cherry-pick-9077-to-release-1.31

openshift-merge-bot[bot] · web-flow · commit f0f6e962e7b8 · 2025-05-06T14:50:37.000Z
OCPBUGS-55435: [release-1.31] : fix schema v1 images not resolve to image ID error
diff --git a/internal/storage/image.go b/internal/storage/image.go
@@ -841,7 +841,12 @@ func pullImageImplementation(ctx context.Context, lookup *imageLookupService, st
 		return nil, nil, err
 	}
 
-	canonicalRef, err := reference.WithDigest(reference.TrimNamed(imageName.Raw()), digest.FromBytes(manifestBytes))
+	dgst, err := manifest.Digest(manifestBytes)
+	if err != nil {
+		return nil, nil, fmt.Errorf("digesting image: %w", err)
+	}
+
+	canonicalRef, err := reference.WithDigest(reference.TrimNamed(imageName.Raw()), dgst)
 	if err != nil {
 		return nil, nil, fmt.Errorf("create canonical reference: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -841,7 +841,12 @@ func pullImageImplementation(ctx context.Context, lookup *imageLookupService, st`
`841`	`841`	`return nil, nil, err`
`842`	`842`	`}`
`843`	`843`
`844`		`- canonicalRef, err := reference.WithDigest(reference.TrimNamed(imageName.Raw()), digest.FromBytes(manifestBytes))`
	`844`	`+ dgst, err := manifest.Digest(manifestBytes)`
	`845`	`+ if err != nil {`
	`846`	`+ return nil, nil, fmt.Errorf("digesting image: %w", err)`
	`847`	`+ }`
	`848`	`+`
	`849`	`+ canonicalRef, err := reference.WithDigest(reference.TrimNamed(imageName.Raw()), dgst)`
`845`	`850`	`if err != nil {`
`846`	`851`	`return nil, nil, fmt.Errorf("create canonical reference: %w", err)`
`847`	`852`	`}`