Skip to content

Commit

Permalink
Merge pull request #46300 from thaJeztah/24.0_backport_fix-platform-c…
Browse files Browse the repository at this point in the history
…heck

[24.0 backport] Don't return an error if the lease is not found
  • Loading branch information
thaJeztah committed Aug 23, 2023
2 parents a7cc790 + b83f5a8 commit e0661af
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions daemon/images/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@ func (i *ImageService) PrepareSnapshot(ctx context.Context, id string, image str
func (i *ImageService) manifestMatchesPlatform(ctx context.Context, img *image.Image, platform ocispec.Platform) (bool, error) {
logger := logrus.WithField("image", img.ID).WithField("desiredPlatform", platforms.Format(platform))

ls, leaseErr := i.leases.ListResources(ctx, leases.Lease{ID: imageKey(img.ID().String())})
if leaseErr != nil {
logger.WithError(leaseErr).Error("Error looking up image leases")
return false, leaseErr
ls, err := i.leases.ListResources(ctx, leases.Lease{ID: imageKey(img.ID().String())})
if err != nil {
if cerrdefs.IsNotFound(err) {
return false, nil
}
logger.WithError(err).Error("Error looking up image leases")
return false, err
}

// Note we are comparing against manifest lists here, which we expect to always have a CPU variant set (where applicable).
Expand Down

0 comments on commit e0661af

Please sign in to comment.