@@ -12057,4 +12057,4 @@

     }

    }

   }

- }

+ }

\ No newline at end of file

@@ -12227,32 +12227,16 @@

    "v1.ImageStreamImage": {

     "id": "v1.ImageStreamImage",

     "required": [

-     "imageName"

+     "image"

     ],

     "properties": {

      "apiVersion": {

       "type": "string",

       "description": "version of the schema the object should have"

      },

-     "dockerImageManifest": {

-      "type": "string",

-      "description": "raw JSON of the manifest"

-     },

-     "dockerImageMetadata": {

-      "type": "string",

-      "description": "metadata about this image"

-     },

-     "dockerImageMetadataVersion": {

-      "type": "string",

-      "description": "conveys version of the object, if empty defaults to '1.0'"

-     },

-     "dockerImageReference": {

-      "type": "string",

-      "description": "string that can be used to pull this image"

-     },

-     "imageName": {

-      "type": "string",

-      "description": "name of image"

+     "image": {

+      "$ref": "v1.Image",

+      "description": "the image associated with the ImageStream and image name"

      },

      "kind": {

       "type": "string",

@@ -12355,32 +12339,16 @@

    "v1.ImageStreamTag": {

     "id": "v1.ImageStreamTag",

     "required": [

-     "imageName"

+     "image"

     ],

     "properties": {

      "apiVersion": {

       "type": "string",

       "description": "version of the schema the object should have"

      },

-     "dockerImageManifest": {

-      "type": "string",

-      "description": "raw JSON of the manifest"

-     },

-     "dockerImageMetadata": {

-      "type": "string",

-      "description": "metadata about this image"

-     },

-     "dockerImageMetadataVersion": {

-      "type": "string",

-      "description": "conveys version of the object, if empty defaults to '1.0'"

-     },

-     "dockerImageReference": {

-      "type": "string",

-      "description": "string that can be used to pull this image"

-     },

-     "imageName": {

-      "type": "string",

-      "description": "name of image"

+     "image": {

+      "$ref": "v1.Image",

+      "description": "the image associated with the ImageStream and tag"

      },

      "kind": {

       "type": "string",

@@ -14181,4 +14149,4 @@

     }

    }

   }

- }

+ }

\ No newline at end of file

@@ -73,9 +73,6 @@ func TestExampleObjectSchemas(t *testing.T) {

 			"jenkins-config":       &kapi.List{},

 			"application-template": &templateapi.Template{},

 		},

-		"../examples/image-repositories": {

-			"image-repositories": &imageapi.ImageRepositoryList{},

-		},

 		"../examples/image-streams": {

 			"image-streams-centos7": &imageapi.ImageStreamList{},

 			"image-streams-rhel7":   &imageapi.ImageStreamList{},

@@ -86,16 +83,14 @@ func TestExampleObjectSchemas(t *testing.T) {

 			"mongodb-template":    &templateapi.Template{},

 		},

 		"../test/integration/fixtures": {

-			"test-deployment-config":        &deployapi.DeploymentConfig{},

-			"test-image":                    &imageapi.Image{},

-			"test-image-repository":         &imageapi.ImageRepository{},

-			"test-image-repository-mapping": &imageapi.ImageRepositoryMapping{},

-			"test-image-stream":             &imageapi.ImageStream{},

-			"test-image-stream-mapping":     &imageapi.ImageStreamMapping{},

-			"test-route":                    &routeapi.Route{},

-			"test-service":                  &kapi.Service{},

-			"test-buildcli":                 &kapi.List{},

-			"test-buildcli-beta2":           &kapi.List{},

+			"test-deployment-config":    &deployapi.DeploymentConfig{},

+			"test-image":                &imageapi.Image{},

+			"test-image-stream":         &imageapi.ImageStream{},

+			"test-image-stream-mapping": &imageapi.ImageStreamMapping{},

+			"test-route":                &routeapi.Route{},

+			"test-service":              &kapi.Service{},

+			"test-buildcli":             &kapi.List{},

+			"test-buildcli-beta2":       &kapi.List{},

 		},

 		"../test/templates/fixtures": {

 			"crunchydata-pod": nil, // Explicitly fails validation, but should pass transformation

@@ -50,17 +50,24 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se

 			j.DockerImageMetadataVersion = []string{"pre012", "1.0"}[c.Rand.Intn(2)]

 			j.DockerImageReference = c.RandString()

 		},

-		func(j *image.ImageRepositoryMapping, c fuzz.Continue) {

-			c.FuzzNoCustom(j)

-			j.DockerImageRepository = ""

-		},

 		func(j *image.ImageStreamMapping, c fuzz.Continue) {

 			c.FuzzNoCustom(j)

 			j.DockerImageRepository = ""

 		},

+		func(j *image.ImageStreamImage, c fuzz.Continue) {

+			c.Fuzz(&j.Image)

+			// because we de-embedded Image from ImageStreamImage, in order to round trip

+			// successfully, the ImageStreamImage's ObjectMeta must match the Image's.

+			j.ObjectMeta = j.Image.ObjectMeta

+		},

+		func(j *image.ImageStreamTag, c fuzz.Continue) {

+			c.Fuzz(&j.Image)

+			// because we de-embedded Image from ImageStreamTag, in order to round trip

+			// successfully, the ImageStreamTag's ObjectMeta must match the Image's.

+			j.ObjectMeta = j.Image.ObjectMeta

+		},

 		func(j *image.TagReference, c fuzz.Continue) {

 			c.FuzzNoCustom(j)

-			j.DockerImageReference = ""

 			if j.From != nil {

 				specs := []string{"", "ImageStreamTag", "ImageStreamImage"}

 				j.From.Kind = specs[c.Intn(len(specs))]

@@ -224,12 +231,8 @@ var skipStandardVersions = map[string][]string{

 	"DockerImage": {"pre012", "1.0"},

 }

 var skipV1beta1 = map[string]struct{}{}

-var skipV1beta3 = map[string]struct{}{

-	"ImageRepository": {},

-}

-var skipV1 = map[string]struct{}{

-	"ImageRepository": {},

-}

+var skipV1beta3 = map[string]struct{}{}

+var skipV1 = map[string]struct{}{}

 const fuzzIters = 20

@@ -238,7 +241,7 @@ func TestSpecificKind(t *testing.T) {

 	api.Scheme.Log(t)

 	defer api.Scheme.Log(nil)

-	kind := "ImageRepositoryList"

+	kind := "ImageStreamTag"

 	item, err := api.Scheme.New("", kind)

 	if err != nil {

 		t.Errorf("Couldn't make a %v? %v", kind, err)

@@ -45,20 +45,8 @@ func ValidateObject(obj runtime.Object) (errors []error) {

 	case *imageapi.Image:

 		t.Namespace = ""

 		errors = imagev.ValidateImage(t)

-	case *imageapi.ImageRepository:

-		s := &imageapi.ImageStream{}

-		if err := kapi.Scheme.Convert(&t, &s); err != nil {

-			return []error{err}

-		}

-		return imagev.ValidateImageStream(s)

 	case *imageapi.ImageStream:

 		errors = imagev.ValidateImageStream(t)

-	case *imageapi.ImageRepositoryMapping:

-		m := &imageapi.ImageStreamMapping{}

-		if err := kapi.Scheme.Convert(&t, &m); err != nil {

-			return []error{err}

-		}

-		return imagev.ValidateImageStreamMapping(m)

 	case *imageapi.ImageStreamMapping:

 		errors = imagev.ValidateImageStreamMapping(t)

 	case *deployapi.DeploymentConfig:

@@ -400,7 +400,7 @@ func mockBuildConfigInstantiator(buildcfg *buildapi.BuildConfig, imageStream *im

 				return imageStream, nil

 			},

 			GetImageStreamTagFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStreamTag, error) {

-				return &imageapi.ImageStreamTag{Image: *image, ImageName: name}, nil

+				return &imageapi.ImageStreamTag{Image: *image}, nil

 			},

 			GetImageStreamImageFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStreamImage, error) {

 				return &imageapi.ImageStreamImage{Image: *image}, nil

@@ -299,7 +299,7 @@ func (g *BuildGenerator) resolveImageStreamReference(ctx kapi.Context, from *kap

 		}

 		return image.String(), nil

 	case "ImageStreamImage":

-		image, err := g.Client.GetImageStreamImage(kapi.WithNamespace(ctx, namespace), from.Name)

+		imageStreamImage, err := g.Client.GetImageStreamImage(kapi.WithNamespace(ctx, namespace), from.Name)

 		if err != nil {

 			glog.V(2).Infof("Error ImageStreamReference %s in namespace %s: %v", from.Name, namespace, err)

 			if errors.IsNotFound(err) {

@@ -307,10 +307,11 @@ func (g *BuildGenerator) resolveImageStreamReference(ctx kapi.Context, from *kap

 			}

 			return "", fatalError{err}

 		}

+		image := imageStreamImage.Image

 		glog.V(4).Infof("Resolved ImageStreamReference %s to image %s with reference %s in namespace %s", from.Name, image.Name, image.DockerImageReference, namespace)

 		return image.DockerImageReference, nil

 	case "ImageStreamTag":

-		image, err := g.Client.GetImageStreamTag(kapi.WithNamespace(ctx, namespace), from.Name)

+		imageStreamTag, err := g.Client.GetImageStreamTag(kapi.WithNamespace(ctx, namespace), from.Name)

 		if err != nil {

 			glog.V(2).Infof("Error resolving ImageStreamTag reference %s in namespace %s: %v", from.Name, namespace, err)

 			if errors.IsNotFound(err) {

@@ -318,6 +319,7 @@ func (g *BuildGenerator) resolveImageStreamReference(ctx kapi.Context, from *kap

 			}

 			return "", fatalError{err}

 		}

+		image := imageStreamTag.Image

 		glog.V(4).Infof("Resolved ImageStreamTag %s to image %s with reference %s in namespace %s", from.Name, image.Name, image.DockerImageReference, namespace)

 		return image.DockerImageReference, nil

 	case "DockerImage":

@@ -339,7 +339,6 @@ func TestGenerateBuildWithImageTagForSourceStrategyImageRepository(t *testing.T)

 			},

 			GetImageStreamTagFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStreamTag, error) {

 				return &imageapi.ImageStreamTag{

-					ImageName: name,

 					Image: imageapi.Image{

 						ObjectMeta:           kapi.ObjectMeta{Name: imageRepoName + ":" + newTag},

 						DockerImageReference: originalImage + ":" + newTag,

@@ -417,7 +416,6 @@ func TestGenerateBuildWithImageTagForDockerStrategyImageRepository(t *testing.T)

 			},

 			GetImageStreamTagFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStreamTag, error) {

 				return &imageapi.ImageStreamTag{

-					ImageName: name,

 					Image: imageapi.Image{

 						ObjectMeta:           kapi.ObjectMeta{Name: imageRepoName + ":" + newTag},

 						DockerImageReference: originalImage + ":" + newTag,

@@ -494,7 +492,6 @@ func TestGenerateBuildWithImageTagForCustomStrategyImageRepository(t *testing.T)

 			},

 			GetImageStreamTagFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStreamTag, error) {

 				return &imageapi.ImageStreamTag{

-					ImageName: name,

 					Image: imageapi.Image{

 						ObjectMeta:           kapi.ObjectMeta{Name: imageRepoName + ":" + newTag},

 						DockerImageReference: originalImage + ":" + newTag,

@@ -964,7 +961,6 @@ func mockBuildGenerator() *BuildGenerator {

 			},

 			GetImageStreamTagFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStreamTag, error) {

 				return &imageapi.ImageStreamTag{

-					ImageName: name,

 					Image: imageapi.Image{

 						ObjectMeta:           kapi.ObjectMeta{Name: imageRepoName + ":" + newTag},

 						DockerImageReference: latestDockerReference,

@@ -103,7 +103,7 @@ func TestCreateInstantiate(t *testing.T) {

 				return imageStream, nil

 			},

 			GetImageStreamTagFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStreamTag, error) {

-				return &imageapi.ImageStreamTag{*image, name}, nil

+				return &imageapi.ImageStreamTag{Image: *image}, nil

 			},

 			GetImageStreamImageFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStreamImage, error) {

 				return &imageapi.ImageStreamImage{Image: *image}, nil

deleted file mode 100644

@@ -1,102 +0,0 @@

-package client

-

-import (

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"

-

-	imageapi "github.com/openshift/origin/pkg/image/api"

-)

-

-// ImageRepositoriesNamespacer has methods to work with ImageRepository resources in a namespace

-type ImageRepositoriesNamespacer interface {

-	ImageRepositories(namespace string) ImageRepositoryInterface

-}

-

-// ImageRepositoryInterface exposes methods on ImageRepository resources.

-type ImageRepositoryInterface interface {

-	List(label labels.Selector, field fields.Selector) (*imageapi.ImageRepositoryList, error)

-	Get(name string) (*imageapi.ImageRepository, error)

-	Create(repo *imageapi.ImageRepository) (*imageapi.ImageRepository, error)

-	Update(repo *imageapi.ImageRepository) (*imageapi.ImageRepository, error)

-	Delete(name string) error

-	Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error)

-}

-

-// ImageRepositoryNamespaceGetter exposes methods to get ImageRepositories by Namespace

-type ImageRepositoryNamespaceGetter interface {

-	GetByNamespace(namespace, name string) (*imageapi.ImageRepository, error)

-}

-

-// imageRepositories implements ImageRepositoriesNamespacer interface

-type imageRepositories struct {

-	r  *Client

-	ns string

-}

-

-// newImageRepositories returns an imageRepositories

-func newImageRepositories(c *Client, namespace string) *imageRepositories {

-	return &imageRepositories{

-		r:  c,

-		ns: namespace,

-	}

-}

-

-// List returns a list of imagerepositories that match the label and field selectors.

-func (c *imageRepositories) List(label labels.Selector, field fields.Selector) (result *imageapi.ImageRepositoryList, err error) {

-	result = &imageapi.ImageRepositoryList{}

-	err = c.r.Get().

-		Namespace(c.ns).

-		Resource("imageRepositories").

-		LabelsSelectorParam(label).

-		FieldsSelectorParam(field).

-		Do().

-		Into(result)

-	return

-}

-

-// Get returns information about a particular imagerepository and error if one occurs.

-func (c *imageRepositories) Get(name string) (result *imageapi.ImageRepository, err error) {

-	result = &imageapi.ImageRepository{}

-	err = c.r.Get().Namespace(c.ns).Resource("imageRepositories").Name(name).Do().Into(result)

-	return

-}

-

-// GetByNamespace returns information about a particular imagerepository in a particular namespace and error if one occurs.

-func (c *imageRepositories) GetByNamespace(namespace, name string) (result *imageapi.ImageRepository, err error) {

-	result = &imageapi.ImageRepository{}

-	c.r.Get().Namespace(namespace).Resource("imageRepositories").Name(name).Do().Into(result)

-	return

-}

-

-// Create create a new imagerepository. Returns the server's representation of the imagerepository and error if one occurs.

-func (c *imageRepositories) Create(repo *imageapi.ImageRepository) (result *imageapi.ImageRepository, err error) {

-	result = &imageapi.ImageRepository{}

-	err = c.r.Post().Namespace(c.ns).Resource("imageRepositories").Body(repo).Do().Into(result)

-	return

-}

-

-// Update updates the imagerepository on the server. Returns the server's representation of the imagerepository and error if one occurs.

-func (c *imageRepositories) Update(repo *imageapi.ImageRepository) (result *imageapi.ImageRepository, err error) {

-	result = &imageapi.ImageRepository{}

-	err = c.r.Put().Namespace(c.ns).Resource("imageRepositories").Name(repo.Name).Body(repo).Do().Into(result)

-	return

-}

-

-// Delete deletes an image repository, returns error if one occurs.

-func (c *imageRepositories) Delete(name string) (err error) {

-	err = c.r.Delete().Namespace(c.ns).Resource("imageRepositories").Name(name).Do().Error()

-	return

-}

-

-// Watch returns a watch.Interface that watches the requested imagerepositories.

-func (c *imageRepositories) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	return c.r.Get().

-		Prefix("watch").

-		Namespace(c.ns).

-		Resource("imageRepositories").

-		Param("resourceVersion", resourceVersion).

-		LabelsSelectorParam(label).

-		FieldsSelectorParam(field).

-		Watch()

-}

deleted file mode 100644

@@ -1,34 +0,0 @@

-package client

-

-import (

-	imageapi "github.com/openshift/origin/pkg/image/api"

-)

-

-// ImageRepositoryMappingsNamespacer has methods to work with ImageRepositoryMapping resources in a namespace

-type ImageRepositoryMappingsNamespacer interface {

-	ImageRepositoryMappings(namespace string) ImageRepositoryMappingInterface

-}

-

-// ImageRepositoryMappingInterface exposes methods on ImageRepositoryMapping resources.

-type ImageRepositoryMappingInterface interface {

-	Create(mapping *imageapi.ImageRepositoryMapping) error

-}

-

-// imageRepositoryMappings implements ImageRepositoryMappingsNamespacer interface

-type imageRepositoryMappings struct {

-	r  *Client

-	ns string

-}

-

-// newImageRepositoryMappings returns an imageRepositoryMappings

-func newImageRepositoryMappings(c *Client, namespace string) *imageRepositoryMappings {

-	return &imageRepositoryMappings{

-		r:  c,

-		ns: namespace,

-	}

-}

-

-// Create creates a new imagerepository mapping on the server. Returns error if one occurs.

-func (c *imageRepositoryMappings) Create(mapping *imageapi.ImageRepositoryMapping) error {

-	return c.r.Post().Namespace(c.ns).Resource("imageRepositoryMappings").Body(mapping).Do().Error()

-}

deleted file mode 100644

@@ -1,44 +0,0 @@

-package client

-

-import (

-	"fmt"

-

-	"github.com/openshift/origin/pkg/image/api"

-)

-

-// ImageRepositoryTagsNamespacer has methods to work with ImageRepositoryTag resources in a namespace

-type ImageRepositoryTagsNamespacer interface {

-	ImageRepositoryTags(namespace string) ImageRepositoryTagInterface

-}

-

-// ImageRepositoryTagInterface exposes methods on ImageRepositoryTag resources.

-type ImageRepositoryTagInterface interface {

-	Get(name, tag string) (*api.ImageRepositoryTag, error)

-	Delete(name, tag string) error

-}

-

-// imageRepositoryTags implements ImageRepositoryTagsNamespacer interface

-type imageRepositoryTags struct {

-	r  *Client

-	ns string

-}

-

-// newImageRepositoryTags returns an imageRepositoryTags

-func newImageRepositoryTags(c *Client, namespace string) *imageRepositoryTags {

-	return &imageRepositoryTags{

-		r:  c,

-		ns: namespace,

-	}

-}

-

-// Get finds the specified image by name of an image repository and tag.

-func (c *imageRepositoryTags) Get(name, tag string) (result *api.ImageRepositoryTag, err error) {

-	result = &api.ImageRepositoryTag{}

-	err = c.r.Get().Namespace(c.ns).Resource("imageRepositoryTags").Name(fmt.Sprintf("%s:%s", name, tag)).Do().Into(result)

-	return

-}

-

-// Delete deletes the specified tag from the image repository.

-func (c *imageRepositoryTags) Delete(name, tag string) error {

-	return c.r.Delete().Namespace(c.ns).Resource("imageRepositoryTags").Name(fmt.Sprintf("%s:%s", name, tag)).Do().Error()

-}

@@ -464,7 +464,7 @@ func (d *ImageStreamTagDescriber) Describe(namespace, name string) (string, erro

 		return "", err

 	}

-	return describeImage(&imageStreamTag.Image, imageStreamTag.ImageName)

+	return describeImage(&imageStreamTag.Image, imageStreamTag.Image.Name)

 }

 // ImageStreamImageDescriber generates information about a ImageStreamImage (Image).

@@ -481,7 +481,7 @@ func (d *ImageStreamImageDescriber) Describe(namespace, name string) (string, er

 		return "", err

 	}

-	return describeImage(&imageStreamImage.Image, imageStreamImage.ImageName)

+	return describeImage(&imageStreamImage.Image, imageStreamImage.Image.Name)

 }

 // ImageStreamDescriber generates information about a ImageStream

@@ -165,9 +165,12 @@ func formatImageStreamTags(out *tabwriter.Writer, stream *imageapi.ImageStream)

 		specTag := ""

 		if ok {

 			if tagRef.From != nil {

-				specTag = fmt.Sprintf("%s/%s", tagRef.From.Namespace, tagRef.From.Name)

-			} else if len(tagRef.DockerImageReference) != 0 {

-				specTag = tagRef.DockerImageReference

+				switch tagRef.From.Kind {

+				case "ImageStreamTag", "ImageStreamImage":

+					specTag = fmt.Sprintf("%s/%s", tagRef.From.Namespace, tagRef.From.Name)

+				case "DockerImage":

+					specTag = tagRef.From.Name

+				}

 			}

 		} else {

 			specTag = "<pushed>"

@@ -68,11 +68,8 @@ func NewHumanReadablePrinter(noHeaders, withNamespace bool) *kctl.HumanReadableP

 	p.Handler(buildConfigColumns, printBuildConfigList)

 	p.Handler(imageColumns, printImage)

 	p.Handler(imageStreamTagColumns, printImageStreamTag)

-	p.Handler(imageColumns, printImageRepositoryTag)

 	p.Handler(imageStreamImageColumns, printImageStreamImage)

 	p.Handler(imageColumns, printImageList)

-	p.Handler(imageStreamColumns, printImageRepository)

-	p.Handler(imageStreamColumns, printImageRepositoryList)

 	p.Handler(imageStreamColumns, printImageStream)

 	p.Handler(imageStreamColumns, printImageStreamList)

 	p.Handler(projectColumns, printProject)

@@ -228,20 +225,16 @@ func printImage(image *imageapi.Image, w io.Writer, withNamespace bool) error {

 func printImageStreamTag(ist *imageapi.ImageStreamTag, w io.Writer, withNamespace bool) error {

 	created := fmt.Sprintf("%s ago", formatRelativeTime(ist.CreationTimestamp.Time))

-	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", ist.Name, ist.Image.DockerImageReference, created, ist.ImageName)

+	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", ist.Name, ist.Image.DockerImageReference, created, ist.Image.Name)

 	return err

 }

 func printImageStreamImage(isi *imageapi.ImageStreamImage, w io.Writer, withNamespace bool) error {

 	created := fmt.Sprintf("%s ago", formatRelativeTime(isi.CreationTimestamp.Time))

-	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", isi.Name, isi.Image.DockerImageReference, created, isi.ImageName)

+	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", isi.Name, isi.Image.DockerImageReference, created, isi.Image.Name)

 	return err

 }

-func printImageRepositoryTag(irt *imageapi.ImageRepositoryTag, w io.Writer, withNamespace bool) error {

-	return printImage(&irt.Image, w, withNamespace)

-}

-

 func printImageList(images *imageapi.ImageList, w io.Writer, withNamespace bool) error {

 	for _, image := range images.Items {

 		if err := printImage(&image, w, withNamespace); err != nil {

@@ -251,26 +244,6 @@ func printImageList(images *imageapi.ImageList, w io.Writer, withNamespace bool)

 	return nil

 }

-func printImageRepository(repo *imageapi.ImageRepository, w io.Writer, withNamespace bool) error {

-	tags := ""

-	set := util.NewStringSet()

-	for tag := range repo.Status.Tags {

-		set.Insert(tag)

-	}

-	tags = strings.Join(set.List(), ",")

-	_, err := fmt.Fprintf(w, "%s\t%s\t%s\n", repo.Name, repo.Status.DockerImageRepository, tags)

-	return err

-}

-

-func printImageRepositoryList(repos *imageapi.ImageRepositoryList, w io.Writer, withNamespace bool) error {

-	for _, repo := range repos.Items {

-		if err := printImageRepository(&repo, w, withNamespace); err != nil {

-			return err

-		}

-	}

-	return nil

-}

-

 func printImageStream(stream *imageapi.ImageStream, w io.Writer, withNamespace bool) error {

 	tags := ""

 	set := util.NewStringSet()

@@ -123,9 +123,9 @@ func (r *repository) GetByTag(ctx context.Context, tag string) (*manifest.Signed

 	}

 	image := &imageStreamTag.Image

-	dgst, err := digest.ParseDigest(imageStreamTag.ImageName)

+	dgst, err := digest.ParseDigest(imageStreamTag.Image.Name)

 	if err != nil {

-		log.Errorf("Error parsing digest %q: %v", imageStreamTag.ImageName, err)

+		log.Errorf("Error parsing digest %q: %v", imageStreamTag.Image.Name, err)

 		return nil, err

 	}

@@ -270,7 +270,14 @@ func (r *ImageRef) ImageStream() (*imageapi.ImageStream, error) {

 			Name: name,

 		},

 		Spec: imageapi.ImageStreamSpec{

-			Tags: map[string]imageapi.TagReference{imageapi.DefaultImageTag: {DockerImageReference: r.DockerImageReference.String()}},

+			Tags: map[string]imageapi.TagReference{

+				imageapi.DefaultImageTag: {

+					From: &kapi.ObjectReference{

+						Kind: "DockerImage",

+						Name: r.DockerImageReference.String(),

+					},

+				},

+			},

 		},

 	}

 	if !r.OutputImage {

@@ -279,13 +279,14 @@ func (r ImageStreamResolver) Resolve(value string) (*ComponentMatch, error) {

 		if latest == nil {

 			return nil, ErrNoMatch{value: value, qualifier: fmt.Sprintf("no image recorded for %s/%s:%s", repo.Namespace, repo.Name, searchTag)}

 		}

-		imageData, err := r.ImageStreamImages.ImageStreamImages(namespace).Get(ref.Name, latest.Image)

+		imageStreamImage, err := r.ImageStreamImages.ImageStreamImages(namespace).Get(ref.Name, latest.Image)

 		if err != nil {

 			if errors.IsNotFound(err) {

 				return nil, ErrNoMatch{value: value, qualifier: fmt.Sprintf("tag %q is set, but image %q has been removed", searchTag, latest.Image)}

 			}

 			return nil, err

 		}

+		imageData := imageStreamImage.Image

 		ref.Registry = ""

 		return &ComponentMatch{

@@ -47,63 +47,6 @@ func init() {

 			out.Size = in.Size

 			return nil

 		},

-		func(in *ImageStream, out *ImageRepository, s conversion.Scope) error {

-			if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {

-				return err

-			}

-

-			out.DockerImageRepository = in.Spec.DockerImageRepository

-

-			if in.Spec.Tags != nil && out.Tags == nil {

-				out.Tags = make(map[string]string)

-			}

-			for tag, tagRef := range in.Spec.Tags {

-				value := tagRef.DockerImageReference

-				if len(value) == 0 && tagRef.From != nil && len(tagRef.From.Kind) == 0 {

-					value = tagRef.From.Name

-				}

-				out.Tags[tag] = value

-			}

-

-			return s.Convert(&in.Status, &out.Status, 0)

-		},

-		func(in *ImageRepository, out *ImageStream, s conversion.Scope) error {

-			if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {

-				return err

-			}

-

-			out.Spec.DockerImageRepository = in.DockerImageRepository

-

-			if in.Tags != nil && out.Spec.Tags == nil {

-				out.Spec.Tags = make(map[string]TagReference)

-			}

-			for tag, value := range in.Tags {

-				out.Spec.Tags[tag] = TagReference{DockerImageReference: value}

-			}

-			return s.Convert(&in.Status, &out.Status, 0)

-		},

-		func(in *ImageStreamStatus, out *ImageRepositoryStatus, s conversion.Scope) error {

-			out.DockerImageRepository = in.DockerImageRepository

-			out.Tags = in.Tags

-			return nil

-		},

-		func(in *ImageRepositoryStatus, out *ImageStreamStatus, s conversion.Scope) error {

-			out.DockerImageRepository = in.DockerImageRepository

-			out.Tags = in.Tags

-			return nil

-		},

-		func(in *ImageStreamMapping, out *ImageRepositoryMapping, s conversion.Scope) error {

-			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames)

-		},

-		func(in *ImageRepositoryMapping, out *ImageStreamMapping, s conversion.Scope) error {

-			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames)

-		},

-		func(in *ImageStreamTag, out *ImageRepositoryTag, s conversion.Scope) error {

-			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames)

-		},

-		func(in *ImageRepositoryTag, out *ImageStreamTag, s conversion.Scope) error {

-			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames)

-		},

 	)

 	if err != nil {

 		// If one of the conversion functions is malformed, detect it immediately.

@@ -8,10 +8,6 @@ func init() {

 	api.Scheme.AddKnownTypes("",

 		&Image{},

 		&ImageList{},

-		&ImageRepository{},

-		&ImageRepositoryList{},

-		&ImageRepositoryMapping{},

-		&ImageRepositoryTag{},

 		&ImageStream{},

 		&ImageStreamList{},

 		&ImageStreamMapping{},

@@ -21,13 +17,11 @@ func init() {

 	)

 }

-func (*Image) IsAnAPIObject()                  {}

-func (*ImageList) IsAnAPIObject()              {}

-func (*ImageRepository) IsAnAPIObject()        {}

-func (*ImageRepositoryList) IsAnAPIObject()    {}

-func (*ImageRepositoryMapping) IsAnAPIObject() {}

-func (*DockerImage) IsAnAPIObject()            {}

-func (*ImageStream) IsAnAPIObject()            {}

-func (*ImageStreamList) IsAnAPIObject()        {}

-func (*ImageStreamMapping) IsAnAPIObject()     {}

-func (*ImageStreamTag) IsAnAPIObject()         {}

+func (*Image) IsAnAPIObject()              {}

+func (*ImageList) IsAnAPIObject()          {}

+func (*DockerImage) IsAnAPIObject()        {}

+func (*ImageStream) IsAnAPIObject()        {}

+func (*ImageStreamList) IsAnAPIObject()    {}

+func (*ImageStreamMapping) IsAnAPIObject() {}

+func (*ImageStreamTag) IsAnAPIObject()     {}

+func (*ImageStreamImage) IsAnAPIObject()   {}

@@ -7,10 +7,10 @@ import (

 // ImageList is a list of Image objects.

 type ImageList struct {

-	kapi.TypeMeta `json:",inline"`

-	kapi.ListMeta `json:"metadata,omitempty"`

+	kapi.TypeMeta

+	kapi.ListMeta

-	Items []Image `json:"items"`

+	Items []Image

 }

 const (

@@ -24,175 +24,119 @@ const (

 	// InsecureRepositoryAnnotation may be set true on an image stream to allow insecure access to pull content.

 	InsecureRepositoryAnnotation = "openshift.io/image.insecureRepository"

+

+	// DefaultImageTag is used when an image tag is needed and the configuration does not specify a tag to use.

+	DefaultImageTag = "latest"

 )

 // Image is an immutable representation of a Docker image and metadata at a point in time.

 type Image struct {

-	kapi.TypeMeta   `json:",inline"`

-	kapi.ObjectMeta `json:"metadata,omitempty"`

+	kapi.TypeMeta

+	kapi.ObjectMeta

 	// The string that can be used to pull this image.

-	DockerImageReference string `json:"dockerImageReference,omitempty"`

+	DockerImageReference string

 	// Metadata about this image

-	DockerImageMetadata DockerImage `json:"dockerImageMetadata,omitempty"`

+	DockerImageMetadata DockerImage

 	// This attribute conveys the version of docker metadata the JSON should be stored in, which if empty defaults to "1.0"

-	DockerImageMetadataVersion string `json:"dockerImageMetadataVersion,omitempty"`

+	DockerImageMetadataVersion string

 	// The raw JSON of the manifest

-	DockerImageManifest string `json:"rawManifest,omitempty"`

-}

-

-// ImageRepositoryList is a list of ImageRepository objects.

-//

-// ImageRepositoryList is DEPRECATED; use ImageStreamList instead.

-type ImageRepositoryList struct {

-	kapi.TypeMeta `json:",inline"`

-	kapi.ListMeta `json:"metadata,omitempty"`

-

-	Items []ImageRepository `json:"items"`

+	DockerImageManifest string

 }

 // ImageStreamList is a list of ImageStream objects.

 type ImageStreamList struct {

-	kapi.TypeMeta `json:",inline"`

-	kapi.ListMeta `json:"metadata,omitempty"`

+	kapi.TypeMeta

+	kapi.ListMeta

-	Items []ImageStream `json:"items"`

-}

-

-// ImageRepository stores a mapping of tags to images, metadata overrides that are applied

-// when images are tagged in a repository, and an optional reference to a Docker image

-// repository on a registry.

-//

-// ImageRepository is DEPRECATED; use ImageStream instead.

-type ImageRepository struct {

-	kapi.TypeMeta   `json:",inline"`

-	kapi.ObjectMeta `json:"metadata,omitempty"`

-

-	// Optional, if specified this repository is backed by a Docker repository on this server

-	DockerImageRepository string `json:"dockerImageRepository,omitempty"`

-	// Tags map arbitrary string values to specific image locators

-	Tags map[string]string `json:"tags,omitempty"`

-

-	// Status describes the current state of this repository

-	Status ImageRepositoryStatus `json:"status,omitempty"`

+	Items []ImageStream

 }

 // ImageStream stores a mapping of tags to images, metadata overrides that are applied

 // when images are tagged in a stream, and an optional reference to a Docker image

 // repository on a registry.

 type ImageStream struct {

-	kapi.TypeMeta   `json:",inline"`

-	kapi.ObjectMeta `json:"metadata,omitempty"`

+	kapi.TypeMeta

+	kapi.ObjectMeta

 	// Spec describes the desired state of this stream

-	Spec ImageStreamSpec `json:"spec"`

+	Spec ImageStreamSpec

 	// Status describes the current state of this stream

-	Status ImageStreamStatus `json:"status,omitempty"`

+	Status ImageStreamStatus

 }

 // ImageStreamSpec represents options for ImageStreams.

 type ImageStreamSpec struct {

 	// Optional, if specified this stream is backed by a Docker repository on this server

-	DockerImageRepository string `json:"dockerImageRepository"`

+	DockerImageRepository string

 	// Tags map arbitrary string values to specific image locators

-	Tags map[string]TagReference `json:"tags,omitempty"`

+	Tags map[string]TagReference

 }

-// TagReference allows a user to TODO.

+// TagReference specifies optional annotations for images using this tag and an optional reference to an ImageStreamTag, ImageStreamImage, or DockerImage this tag should track.

 type TagReference struct {

-	Annotations          map[string]string     `json:"annotations,omitempty"`

-	DockerImageReference string                `json:"dockerImageReference,omitempty"`

-	From                 *kapi.ObjectReference `json:"from,omitempty"`

-}

-

-// ImageRepositoryStatus contains information about the state of this image repository.

-//

-// ImageRepositoryStatus is DEPRECATED; use ImageStreamStatus instead.

-type ImageRepositoryStatus struct {

-	// Represents the effective location this repository may be accessed at. May be empty until the server

-	// determines where the repository is located

-	DockerImageRepository string `json:"dockerImageRepository,omitempty"`

-	// A historical record of images associated with each tag. The first entry in the TagEvent array is

-	// the currently tagged image.

-	Tags map[string]TagEventList `json:"tags,omitempty"`

+	// Optional; if specified, annotations that are applied to images retrieved via ImageStreamTags.

+	Annotations map[string]string

+	// Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage.

+	From *kapi.ObjectReference

 }

 // ImageStreamStatus contains information about the state of this image stream.

 type ImageStreamStatus struct {

 	// Represents the effective location this stream may be accessed at. May be empty until the server

 	// determines where the repository is located

-	DockerImageRepository string `json:"dockerImageRepository,omitempty"`

+	DockerImageRepository string

 	// A historical record of images associated with each tag. The first entry in the TagEvent array is

 	// the currently tagged image.

-	Tags map[string]TagEventList `json:"tags,omitempty"`