Merge pull request #2155 from ardaguclu/ocpbugs-63189

OCPBUGS-63189: Unify ErrAlreadyExists to correctly match

Author: openshift-merge-bot[bot]

pkg/cli/image/mirror/mappings.go

@@ -14,9 +14,6 @@ import (
 	"github.com/openshift/oc/pkg/cli/image/imagesource"
 )
 
-// ErrAlreadyExists may be returned by the blob Create function to indicate that the blob already exists.
-var ErrAlreadyExists = fmt.Errorf("blob already exists in the target location")
-
 type Mapping struct {
 	Source      imagesource.TypedImageReference
 	Destination imagesource.TypedImageReference

pkg/cli/image/mirror/mirror.go

@@ -723,7 +723,7 @@ func copyBlob(ctx context.Context, plan *workPlan, c *repositoryBlobCopy, blob d
 	copyfn := func() error {
 		w, err := c.to.Create(ctx, options...)
 		// no-op
-		if err == ErrAlreadyExists {
+		if errors.Is(err, imagesource.ErrAlreadyExists) {
 			klog.V(5).Infof("Blob already exists %#v", blob)
 			return nil
 		}