Merge pull request #8117 from soltysh/bug1318537

Merged by openshift-bot

pkg/cmd/cli/cmd/importimage.go

@@ -344,6 +344,11 @@ func (o *ImportImageOptions) createImageImport() (*imageapi.ImageStream, *imagea
 				if len(from) == 0 {
 					from = stream.Spec.DockerImageRepository
 				}
+				// if the from is still empty this means there's no such tag defined
+				// nor we can't create any from .spec.dockerImageRepository
+				if len(from) == 0 {
+					return nil, nil, fmt.Errorf("the tag %q does not exist on the image stream - choose an existing tag to import or use the 'tag' command to create a new tag", tag)
+				}
 				existing = &imageapi.TagReference{
 					From: &kapi.ObjectReference{
 						Kind: "DockerImage",

pkg/cmd/cli/cmd/importimage_test.go

@@ -114,6 +114,24 @@ func TestCreateImageImport(t *testing.T) {
 				},
 			},
 		},
+		{
+			// 5: import latest from image stream which has only tags specified and no latest
+			name: "testis:latest",
+			stream: &imageapi.ImageStream{
+				ObjectMeta: kapi.ObjectMeta{
+					Name:      "testis",
+					Namespace: "other",
+				},
+				Spec: imageapi.ImageStreamSpec{
+					Tags: map[string]imageapi.TagReference{
+						"nonlatest": {
+							From: &kapi.ObjectReference{Kind: "DockerImage", Name: "repo.com/somens/someimage:latest"},
+						},
+					},
+				},
+			},
+			err: "does not exist on the image stream",
+		},
 	}
 
 	for idx, test := range testCases {