Bug 1268000 - replace Image.DockerImageReference with value from status.

pkg/image/registry/imagestreamtag/rest.go

@@ -236,13 +236,18 @@ func newISTag(tag string, imageStream *api.ImageStream, image *api.Image) (*api.
 		if err != nil {
 			return nil, err
 		}
-
 		ist.Image = *imageWithMetadata
 	} else {
 		ist.Image = api.Image{}
-		ist.Image.DockerImageReference = event.DockerImageReference
 		ist.Image.Name = event.Image
 	}
 
+	// Replace the DockerImageReference with the value from event, which contains
+	// real value from status. This should fix the problem for v1 registries,
+	// where mutliple tags point to a single id and only the first image's metadata
+	// is saved. This in turn will always return the pull spec from the first
+	// imported image, which might be different than the requested tag.
+	ist.Image.DockerImageReference = event.DockerImageReference
+
 	return ist, nil
 }

pkg/image/registry/imagestreamtag/rest_test.go

@@ -275,6 +275,55 @@ func TestGetImageStreamTag(t *testing.T) {
 	}
 }
 
+func TestGetImageStreamTagDIR(t *testing.T) {
+	expDockerImageReference := "foo/bar/baz:latest"
+	image := &api.Image{ObjectMeta: kapi.ObjectMeta{Name: "10"}, DockerImageReference: "foo/bar/baz:different"}
+	repo := &api.ImageStream{
+		ObjectMeta: kapi.ObjectMeta{
+			Namespace: "default",
+			Name:      "test",
+		},
+		Status: api.ImageStreamStatus{
+			Tags: map[string]api.TagEventList{
+				"latest": {
+					Items: []api.TagEvent{
+						{
+							Created:              unversioned.Date(2015, 3, 24, 9, 38, 0, 0, time.UTC),
+							DockerImageReference: expDockerImageReference,
+							Image:                "10",
+						},
+					},
+				},
+			},
+		},
+	}
+	fakeEtcdClient, _, storage := setup(t)
+	fakeEtcdClient.Data[etcdtest.AddPrefix("/images/"+image.Name)] = tools.EtcdResponseWithError{
+		R: &etcd.Response{
+			Node: &etcd.Node{
+				Value:         runtime.EncodeOrDie(latest.Codec, image),
+				ModifiedIndex: 1,
+			},
+		},
+	}
+	fakeEtcdClient.Data[etcdtest.AddPrefix("/imagestreams/default/test")] = tools.EtcdResponseWithError{
+		R: &etcd.Response{
+			Node: &etcd.Node{
+				Value:         runtime.EncodeOrDie(latest.Codec, repo),
+				ModifiedIndex: 1,
+			},
+		},
+	}
+	obj, err := storage.Get(kapi.NewDefaultContext(), "test:latest")
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	actual := obj.(*api.ImageStreamTag)
+	if actual.Image.DockerImageReference != expDockerImageReference {
+		t.Errorf("Different DockerImageReference: expected %s, got %s", expDockerImageReference, actual.Image.DockerImageReference)
+	}
+}
+
 func TestDeleteImageStreamTag(t *testing.T) {
 	tests := map[string]struct {
 		repo        *api.ImageStream

test/integration/imagestream_test.go

@@ -200,7 +200,7 @@ func TestImageStreamMappingCreate(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
-	if fromTag.Name != "test:newest" || fromTag.Image.UID == "" || fromTag.Image.DockerImageReference != "some/other/name" {
+	if fromTag.Name != "test:newest" || fromTag.Image.UID == "" || fromTag.Image.DockerImageReference != "different" {
 		t.Errorf("unexpected object: %#v", fromTag)
 	}
 
@@ -235,7 +235,7 @@ func TestImageStreamMappingCreate(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
-	if fromTag.Name != "test:newest" || fromTag.Image.UID == "" || fromTag.Image.DockerImageReference != "some/other/name" {
+	if fromTag.Name != "test:newest" || fromTag.Image.UID == "" || fromTag.Image.DockerImageReference != "different" {
 		t.Errorf("unexpected object: %#v", fromTag)
 	}
 	fromTag, err = clusterAdminClient.ImageStreamTags(testutil.Namespace()).Get(stream.Name, "anothertag")