Fix DockerImageMetadata reading when dealing with versioned client

Author: soltysh

pkg/image/apiserver/admission/limitrange/admission.go

@@ -140,7 +140,7 @@ func (a *imageLimitRangerPlugin) ValidateLimit(limitRange *kapi.LimitRange, kind
 	}
 
 	image := &isObj.Image
-	if err := util.ImageWithMetadata(image); err != nil {
+	if err := util.InternalImageWithMetadata(image); err != nil {
 		return err
 	}
 

pkg/image/apiserver/registry/image/strategy.go

@@ -45,7 +45,7 @@ func (imageStrategy) NamespaceScoped() bool {
 func (s imageStrategy) PrepareForCreate(ctx context.Context, obj runtime.Object) {
 	newImage := obj.(*imageapi.Image)
 	// ignore errors, change in place
-	if err := util.ImageWithMetadata(newImage); err != nil {
+	if err := util.InternalImageWithMetadata(newImage); err != nil {
 		utilruntime.HandleError(fmt.Errorf("Unable to update image metadata for %q: %v", newImage.Name, err))
 	}
 	if newImage.Annotations[imageapi.ImageManifestBlobStoredAnnotation] == "true" {
@@ -124,7 +124,7 @@ func (s imageStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Ob
 		}
 	}
 
-	if err = util.ImageWithMetadata(newImage); err != nil {
+	if err = util.InternalImageWithMetadata(newImage); err != nil {
 		utilruntime.HandleError(fmt.Errorf("Unable to update image metadata for %q: %v", newImage.Name, err))
 	}
 

pkg/image/apiserver/registry/imagestreamimage/rest.go

@@ -93,7 +93,7 @@ func (r *REST) Get(ctx context.Context, id string, options *metav1.GetOptions) (
 	if err != nil {
 		return nil, err
 	}
-	if err := util.ImageWithMetadata(image); err != nil {
+	if err := util.InternalImageWithMetadata(image); err != nil {
 		return nil, err
 	}
 	image.DockerImageManifest = ""

pkg/image/apiserver/registry/imagestreamimport/rest.go

@@ -520,7 +520,7 @@ func (r *REST) importSuccessful(
 	updated, err := r.images.Create(ctx, image, rest.ValidateAllObjectFunc, false)
 	switch {
 	case kapierrors.IsAlreadyExists(err):
-		if err := util.ImageWithMetadata(image); err != nil {
+		if err := util.InternalImageWithMetadata(image); err != nil {
 			glog.V(4).Infof("Unable to update image metadata during image import when image already exists %q: %v", image.Name, err)
 		}
 		updated = image

pkg/image/apiserver/registry/imagestreamtag/rest.go

@@ -444,7 +444,7 @@ func newISTag(tag string, imageStream *imageapi.ImageStream, image *imageapi.Ima
 	}
 
 	if image != nil {
-		if err := util.ImageWithMetadata(image); err != nil {
+		if err := util.InternalImageWithMetadata(image); err != nil {
 			return nil, err
 		}
 		image.DockerImageManifest = ""

pkg/image/importer/importer.go

@@ -444,7 +444,7 @@ func (isi *ImageStreamImporter) importManifest(ctx gocontext.Context, manifest d
 		return
 	}
 
-	if err := util.ImageWithMetadata(image); err != nil {
+	if err := util.InternalImageWithMetadata(image); err != nil {
 		return image, err
 	}