From 2bbf5f5a39de91e86a0dff7cff194e56eddc94ad Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 10 Jun 2025 13:13:44 +0200 Subject: [PATCH] daemon/containerd: ImageService.resolveImage: cleanup resolve by name:tag - scope variables locally to the if/else if - use if/else if to try to make it more clear it's a "best effort" before falling through to other ways of resolving the image reference - remove outdated TODO, now that containerd errdefs can be used for either moby, or containerd error definitions. Signed-off-by: Sebastiaan van Stijn --- daemon/containerd/image.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/daemon/containerd/image.go b/daemon/containerd/image.go index 3fac8d802f..2cac81ced9 100644 --- a/daemon/containerd/image.go +++ b/daemon/containerd/image.go @@ -166,15 +166,12 @@ func (i *ImageService) resolveImage(ctx context.Context, refOrID string) (c8dima return imgs[0], nil } + // Try resolve by name:tag ref := reference.TagNameOnly(parsed.(reference.Named)).String() - img, err := i.images.Get(ctx, ref) - if err == nil { + if img, err := i.images.Get(ctx, ref); err == nil { return img, nil - } else { - // TODO(containerd): error translation can use common function - if !cerrdefs.IsNotFound(err) { - return c8dimages.Image{}, err - } + } else if !cerrdefs.IsNotFound(err) { + return c8dimages.Image{}, err } // If the identifier could be a short ID, attempt to match.