Merge pull request #2089 from kargakis/image-stream-fix

Merged by openshift-bot

Author: OpenShift Bot

hack/test-cmd.sh

@@ -333,6 +333,7 @@ echo "imageStreams: ok"
 [ "$(osc new-app mongo -o yaml | grep library/mongo)" ]
 # the local image repository takes precedence over the Docker Hub "mysql" image
 [ "$(osc new-app mysql -o yaml | grep mysql-55-centos7)" ]
+osc delete all --all
 osc new-app library/php mysql -l no-source=php-mysql
 osc delete all -l no-source=php-mysql
 # check if we can create from a stored template

pkg/generate/app/app.go

@@ -161,6 +161,7 @@ func (s *BuildStrategyRef) BuildStrategy() (*buildapi.BuildStrategy, []buildapi.
 type ImageRef struct {
 	imageapi.DockerImageReference
 	AsImageStream bool
+	OutputImage   bool
 
 	Stream *imageapi.ImageStream
 	Info   *imageapi.DockerImage
@@ -183,10 +184,15 @@ func (r *ImageRef) NameReference() string {
 
 // ObjectReference returns an object reference from the image reference
 func (r *ImageRef) ObjectReference() *kapi.ObjectReference {
+	if r.Stream != nil {
+		return &kapi.ObjectReference{
+			Kind: "ImageStreamTag",
+			Name: r.Name + ":" + r.Tag,
+		}
+	}
 	return &kapi.ObjectReference{
-		Kind:      "ImageStreamTag",
-		Name:      r.Name + ":" + imageapi.DefaultImageTag,
-		Namespace: r.Namespace,
+		Kind: "ImageStreamTag",
+		Name: r.Name + ":" + imageapi.DefaultImageTag,
 	}
 }
 
@@ -241,19 +247,20 @@ func (r *ImageRef) ImageStream() (*imageapi.ImageStream, error) {
 		return nil, fmt.Errorf("unable to suggest an image stream name for %q", r.String())
 	}
 
-	repo := &imageapi.ImageStream{
+	stream := &imageapi.ImageStream{
 		ObjectMeta: kapi.ObjectMeta{
 			Name: name,
 		},
 		Spec: imageapi.ImageStreamSpec{
 			Tags: map[string]imageapi.TagReference{imageapi.DefaultImageTag: {DockerImageReference: r.DockerImageReference.String()}},
 		},
 	}
-	if !r.AsImageStream {
-		repo.Spec.DockerImageRepository = r.String()
+	if !r.OutputImage {
+		stream.Spec.DockerImageRepository = r.String()
+		stream.Spec.Tags = map[string]imageapi.TagReference{}
 	}
 
-	return repo, nil
+	return stream, nil
 }
 
 // DeployableContainer sets up a container for the image ready for deployment

pkg/generate/app/cmd/newapp_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"reflect"
+	"sort"
 	"strings"
 	"testing"
 
@@ -464,11 +465,11 @@ func TestRun(t *testing.T) {
 	tests := []struct {
 		name        string
 		config      *AppConfig
-		expectedRes map[string]string
+		expected    map[string][]string
 		expectedErr error
 	}{
 		{
-			name: "",
+			name: "successful ruby app generation",
 			config: &AppConfig{
 				SourceRepositories: util.StringList{"https://github.com/openshift/ruby-hello-world"},
 
@@ -493,53 +494,52 @@ func TestRun(t *testing.T) {
 				osclient:        &client.Fake{},
 				originNamespace: "default",
 			},
-			expectedRes: map[string]string{
-				"imageStream":      "ruby-hello-world",
-				"buildConfig":      "ruby-hello-world",
-				"deploymentConfig": "ruby-hello-world",
-				"service":          "ruby-hello-world"},
+			expected: map[string][]string{
+				"imageStream":      {"ruby-hello-world", "ruby-20-centos7"},
+				"buildConfig":      {"ruby-hello-world"},
+				"deploymentConfig": {"ruby-hello-world"},
+				"service":          {"ruby-hello-world"},
+			},
 			expectedErr: nil,
 		},
 	}
 
 	for _, test := range tests {
 		res, err := test.config.Run(os.Stdout)
 		if err != test.expectedErr {
-			t.Errorf("Error mismatch! Expected %v, got %v", test.expectedErr, err)
+			t.Errorf("%s: Error mismatch! Expected %v, got %v", test.name, test.expectedErr, err)
 			continue
 		}
-		var object, objectName string
+		got := map[string][]string{}
 		for _, obj := range res.List.Items {
-			var unknown bool
 			switch tp := obj.(type) {
 			case *buildapi.BuildConfig:
-				object = "buildConfig"
-				objectName = tp.Name
+				got["buildConfig"] = append(got["buildConfig"], tp.Name)
 			case *kapi.Service:
-				object = "service"
-				objectName = tp.Name
+				got["service"] = append(got["service"], tp.Name)
 			case *imageapi.ImageStream:
-				object = "imageStream"
-				objectName = tp.Name
+				got["imageStream"] = append(got["imageStream"], tp.Name)
 			case *deploy.DeploymentConfig:
-				object = "deploymentConfig"
-				objectName = tp.Name
-			default:
-				t.Errorf("Unknown resource type")
-				unknown = true
+				got["deploymentConfig"] = append(got["deploymentConfig"], tp.Name)
 			}
+		}
 
-			if unknown {
-				continue
-			}
+		if len(test.expected) != len(got) {
+			t.Errorf("%s: Resource kind size mismatch! Expected %d, got %d", test.name, len(test.expected), len(got))
+			continue
+		}
 
-			name, ok := test.expectedRes[object]
+		for k, exp := range test.expected {
+			g, ok := got[k]
 			if !ok {
-				t.Errorf("Expected %s object, but didn't find one", object)
-				continue
+				t.Errorf("%s: Didn't find expected kind %s", test.name, k)
 			}
-			if name != objectName {
-				t.Errorf("Expected object name %s, got %s", name, objectName)
+
+			sort.Strings(g)
+			sort.Strings(exp)
+
+			if !reflect.DeepEqual(g, exp) {
+				t.Errorf("%s: Resource names mismatch! Expected %v, got %v", test.name, exp, g)
 				continue
 			}
 		}

pkg/generate/app/imagelookup.go

@@ -152,15 +152,14 @@ func (r DockerRegistryResolver) Resolve(value string) (*ComponentMatch, error) {
 		return nil, err
 	}
 
-	from := ref.Registry
 	if len(ref.Registry) == 0 {
 		ref.Registry = "Docker Hub"
 	}
 	return &ComponentMatch{
 		Value:       value,
 		Argument:    fmt.Sprintf("--docker-image=%q", value),
 		Name:        value,
-		Description: descriptionFor(dockerImage, value, from),
+		Description: descriptionFor(dockerImage, value, ref.Registry),
 		Builder:     IsBuilderImage(dockerImage),
 		Score:       0,
 		Image:       dockerImage,
@@ -329,7 +328,7 @@ func InputImageFromMatch(match *ComponentMatch) (*ImageRef, error) {
 		if err != nil {
 			return nil, err
 		}
-		input.AsImageStream = false
+		input.AsImageStream = true
 		input.Info = match.Image
 		return input, nil
 

pkg/generate/app/imageref.go

@@ -41,7 +41,6 @@ func (g *imageRefGenerator) FromName(name string) (*ImageRef, error) {
 	}
 	return &ImageRef{
 		DockerImageReference: ref,
-		AsImageStream:        true,
 	}, nil
 }
 

pkg/generate/app/pipeline.go

@@ -50,6 +50,7 @@ func NewBuildPipeline(from string, input *ImageRef, strategy *BuildStrategyRef,
 			Tag:  image.DefaultImageTag,
 		},
 
+		OutputImage:   true,
 		AsImageStream: true,
 	}
 	if input != nil {