@@ -14501,6 +14501,10 @@

       "$ref": "time.Duration",

       "description": "amount of time the build has been running"

      },

+     "outputDockerImageReference": {

+      "type": "string",

+      "description": "reference to the Docker image built by this build, computed from build.spec.output.to, and can be used to push and pull the image"

+     },

      "config": {

       "$ref": "v1.ObjectReference",

       "description": "reference to build config from which this build was derived"

@@ -935,6 +935,7 @@ func deepCopy_api_BuildStatus(in buildapi.BuildStatus, out *buildapi.BuildStatus

 		out.CompletionTimestamp = nil

 	}

 	out.Duration = in.Duration

+	out.OutputDockerImageReference = in.OutputDockerImageReference

 	if in.Config != nil {

 		if newVal, err := c.DeepCopy(in.Config); err != nil {

 			return err

@@ -357,9 +357,6 @@ func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 var skipStandardVersions = map[string][]string{

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

 }

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

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

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

 const fuzzIters = 20

@@ -408,14 +405,10 @@ func TestTypes(t *testing.T) {

 			}

 			fuzzInternalObject(t, "", item, seed)

 			roundTrip(t, osapi.Codec, item)

-			if _, ok := skipV1beta3[kind]; !ok {

-				fuzzInternalObject(t, "v1beta3", item, seed)

-				roundTrip(t, v1beta3.Codec, item)

-			}

-			if _, ok := skipV1[kind]; !ok {

-				fuzzInternalObject(t, "v1", item, seed)

-				roundTrip(t, v1.Codec, item)

-			}

+			fuzzInternalObject(t, "v1beta3", item, seed)

+			roundTrip(t, v1beta3.Codec, item)

+			fuzzInternalObject(t, "v1", item, seed)

+			roundTrip(t, v1.Codec, item)

 		}

 	}

 }

@@ -796,6 +796,7 @@ func convert_api_BuildStatus_To_v1_BuildStatus(in *buildapi.BuildStatus, out *ap

 		out.CompletionTimestamp = nil

 	}

 	out.Duration = in.Duration

+	out.OutputDockerImageReference = in.OutputDockerImageReference

 	if in.Config != nil {

 		out.Config = new(pkgapiv1.ObjectReference)

 		if err := convert_api_ObjectReference_To_v1_ObjectReference(in.Config, out.Config, s); err != nil {

@@ -1183,6 +1184,7 @@ func convert_v1_BuildStatus_To_api_BuildStatus(in *apiv1.BuildStatus, out *build

 		out.CompletionTimestamp = nil

 	}

 	out.Duration = in.Duration

+	out.OutputDockerImageReference = in.OutputDockerImageReference

 	if in.Config != nil {

 		out.Config = new(pkgapi.ObjectReference)

 		if err := convert_v1_ObjectReference_To_api_ObjectReference(in.Config, out.Config, s); err != nil {

@@ -960,6 +960,7 @@ func deepCopy_v1_BuildStatus(in apiv1.BuildStatus, out *apiv1.BuildStatus, c *co

 		out.CompletionTimestamp = nil

 	}

 	out.Duration = in.Duration

+	out.OutputDockerImageReference = in.OutputDockerImageReference

 	if in.Config != nil {

 		if newVal, err := c.DeepCopy(in.Config); err != nil {

 			return err

@@ -834,6 +834,7 @@ func convert_api_BuildStatus_To_v1beta3_BuildStatus(in *buildapi.BuildStatus, ou

 		out.CompletionTimestamp = nil

 	}

 	out.Duration = in.Duration

+	out.OutputDockerImageReference = in.OutputDockerImageReference

 	if in.Config != nil {

 		out.Config = new(pkgapiv1beta3.ObjectReference)

 		if err := convert_api_ObjectReference_To_v1beta3_ObjectReference(in.Config, out.Config, s); err != nil {

@@ -1221,6 +1222,7 @@ func convert_v1beta3_BuildStatus_To_api_BuildStatus(in *apiv1beta3.BuildStatus,

 		out.CompletionTimestamp = nil

 	}

 	out.Duration = in.Duration

+	out.OutputDockerImageReference = in.OutputDockerImageReference

 	if in.Config != nil {

 		out.Config = new(pkgapi.ObjectReference)

 		if err := convert_v1beta3_ObjectReference_To_api_ObjectReference(in.Config, out.Config, s); err != nil {

@@ -968,6 +968,7 @@ func deepCopy_v1beta3_BuildStatus(in apiv1beta3.BuildStatus, out *apiv1beta3.Bui

 		out.CompletionTimestamp = nil

 	}

 	out.Duration = in.Duration

+	out.OutputDockerImageReference = in.OutputDockerImageReference

 	if in.Config != nil {

 		if newVal, err := c.DeepCopy(in.Config); err != nil {

 			return err

@@ -84,6 +84,12 @@ type BuildStatus struct {

 	// Duration contains time.Duration object describing build time.

 	Duration time.Duration

+	// OutputDockerImageReference contains a reference to the Docker image that

+	// will be built by this build. It's value is computed from

+	// Build.Spec.Output.To, and should include the registry address, so that

+	// it can be used to push and pull the image.

+	OutputDockerImageReference string

+

 	// Config is an ObjectReference to the BuildConfig this Build is based on.

 	Config *kapi.ObjectReference

 }

@@ -69,6 +69,12 @@ type BuildStatus struct {

 	// Duration contains time.Duration object describing build time.

 	Duration time.Duration `json:"duration,omitempty" description:"amount of time the build has been running"`

+	// OutputDockerImageReference contains a reference to the Docker image that

+	// will be built by this build. It's value is computed from

+	// Build.Spec.Output.To, and should include the registry address, so that

+	// it can be used to push and pull the image.

+	OutputDockerImageReference string `json:"outputDockerImageReference,omitempty" description:"reference to the Docker image built by this build, computed from build.spec.output.to, and can be used to push and pull the image"`

+

 	// Config is an ObjectReference to the BuildConfig this Build is based on.

 	Config *kapi.ObjectReference `json:"config,omitempty" description:"reference to build config from which this build was derived"`

 }

@@ -69,6 +69,12 @@ type BuildStatus struct {

 	// Duration contains time.Duration object describing build time.

 	Duration time.Duration `json:"duration,omitempty"`

+	// OutputDockerImageReference contains a reference to the Docker image that

+	// will be built by this build. It's value is computed from

+	// Build.Spec.Output.To, and should include the registry address, so that

+	// it can be used to push and pull the image.

+	OutputDockerImageReference string `json:"outputDockerImageReference,omitempty" description:"reference to the Docker image built by this build, computed from build.spec.output.to, and can be used to push and pull the image"`

+

 	// Config is an ObjectReference to the BuildConfig this Build is based on.

 	Config *kapi.ObjectReference `json:"config,omitempty"`

 }

@@ -2,9 +2,10 @@ package controller

 import (

 	"fmt"

-	"github.com/golang/glog"

 	"strings"

+	"github.com/golang/glog"

+

 	kapi "k8s.io/kubernetes/pkg/api"

 	errors "k8s.io/kubernetes/pkg/api/errors"

 	"k8s.io/kubernetes/pkg/client/cache"

@@ -115,61 +116,38 @@ func (bc *BuildController) nextBuildPhase(build *buildapi.Build) error {

 		return nil

 	}

-	// lookup the destination from the referenced image repository

-	var spec string

-	if ref := build.Spec.Output.To; ref != nil && len(ref.Name) != 0 {

-		switch {

-		case ref.Kind == "DockerImage":

-			spec = ref.Name

-		case ref.Kind == "ImageStream" || ref.Kind == "ImageStreamTag":

-			// TODO: security, ensure that the reference image stream is actually visible

-			namespace := ref.Namespace

-			if len(namespace) == 0 {

-				namespace = build.Namespace

-			}

-

-			var tag string

-			streamName := ref.Name

-			if ref.Kind == "ImageStreamTag" {

-				bits := strings.Split(ref.Name, ":")

-				streamName = bits[0]

-				tag = ":" + bits[1]

-			}

-			stream, err := bc.ImageStreamClient.GetImageStream(namespace, streamName)

-			if err != nil {

-				if errors.IsNotFound(err) {

-					return fmt.Errorf("the referenced output ImageStream %s/%s does not exist", namespace, streamName)

-				}

-				return fmt.Errorf("the referenced output ImageStream %s/%s could not be found by Build %s/%s: %v", namespace, streamName, build.Namespace, build.Name, err)

-			}

-			if len(stream.Status.DockerImageRepository) == 0 {

-				e := fmt.Errorf("the ImageStream %s/%s cannot be used as the output for Build %s/%s because the integrated Docker registry is not configured, or the user forgot to set a valid external registry", namespace, ref.Name, build.Namespace, build.Name)

-				bc.Recorder.Eventf(build, "invalidOutput", "Error starting build: %v", e)

-				return e

-			}

-			spec = fmt.Sprintf("%s%s", stream.Status.DockerImageRepository, tag)

-		}

+	// Set the output Docker image reference.

+	ref, err := bc.resolveOutputDockerImageReference(build)

+	if err != nil {

+		return err

 	}

+	build.Status.OutputDockerImageReference = ref

-	// set the expected build parameters, which will be saved if no error occurs

+	// Set the build phase, which will be persisted if no error occurs.

 	build.Status.Phase = buildapi.BuildPhasePending

-	// Make a copy to avoid mutating the build from this point on

+	// Make a copy to avoid mutating the build from this point on.

 	copy, err := kapi.Scheme.Copy(build)

 	if err != nil {

 		return fmt.Errorf("unable to copy Build: %v", err)

 	}

 	buildCopy := copy.(*buildapi.Build)

-	// override the Output to be a DockerImage type in the strategy for the copy we send to the build pod

+	// TODO(rhcarvalho)

+	// The S2I and Docker builders expect build.Spec.Output.To to contain a

+	// resolved reference to a Docker image. Since build.Spec is immutable, we

+	// change a copy (that is never persisted) and pass it to

+	// bc.BuildStrategy.CreateBuildPod. We should make the builders use

+	// build.Status.OutputDockerImageReference, what will make copying the build

+	// unnecessary.

 	if build.Spec.Output.To != nil && len(build.Spec.Output.To.Name) != 0 {

 		buildCopy.Spec.Output.To = &kapi.ObjectReference{

 			Kind: "DockerImage",

-			Name: spec,

+			Name: ref,

 		}

 	}

-	// invoke the strategy to get a build pod

+	// Invoke the strategy to get a build pod.

 	podSpec, err := bc.BuildStrategy.CreateBuildPod(buildCopy)

 	if err != nil {

 		return fmt.Errorf("the strategy failed to create a build pod for Build %s/%s: %v", build.Namespace, build.Name, err)

@@ -181,7 +159,7 @@ func (bc *BuildController) nextBuildPhase(build *buildapi.Build) error {

 			glog.V(4).Infof("Build pod already existed: %#v", podSpec)

 			return nil

 		}

-		// log an event if the pod is not created (most likely due to quota denial)

+		// Log an event if the pod is not created (most likely due to quota denial).

 		bc.Recorder.Eventf(build, "failedCreate", "Error creating: %v", err)

 		return fmt.Errorf("failed to create pod for Build %s/%s: %v", build.Namespace, build.Name, err)

 	}

@@ -190,6 +168,48 @@ func (bc *BuildController) nextBuildPhase(build *buildapi.Build) error {

 	return nil

 }

+// resolveOutputDockerImageReference returns a reference to a Docker image

+// computed from the buid.Spec.Output.To reference.

+func (bc *BuildController) resolveOutputDockerImageReference(build *buildapi.Build) (string, error) {

+	outputTo := build.Spec.Output.To

+	if outputTo == nil || outputTo.Name == "" {

+		return "", nil

+	}

+	var ref string

+	switch outputTo.Kind {

+	case "DockerImage":

+		ref = outputTo.Name

+	case "ImageStream", "ImageStreamTag":

+		// TODO(smarterclayton): security, ensure that the reference image stream is actually visible

+		namespace := outputTo.Namespace

+		if len(namespace) == 0 {

+			namespace = build.Namespace

+		}

+

+		var tag string

+		streamName := outputTo.Name

+		if outputTo.Kind == "ImageStreamTag" {

+			bits := strings.Split(outputTo.Name, ":")

+			streamName = bits[0]

+			tag = ":" + bits[1]

+		}

+		stream, err := bc.ImageStreamClient.GetImageStream(namespace, streamName)

+		if err != nil {

+			if errors.IsNotFound(err) {

+				return "", fmt.Errorf("the referenced output ImageStream %s/%s does not exist", namespace, streamName)

+			}

+			return "", fmt.Errorf("the referenced output ImageStream %s/%s could not be found by Build %s/%s: %v", namespace, streamName, build.Namespace, build.Name, err)

+		}

+		if len(stream.Status.DockerImageRepository) == 0 {

+			e := fmt.Errorf("the ImageStream %s/%s cannot be used as the output for Build %s/%s because the integrated Docker registry is not configured and no external registry was defined", namespace, outputTo.Name, build.Namespace, build.Name)

+			bc.Recorder.Eventf(build, "invalidOutput", "Error starting build: %v", e)

+			return "", e

+		}

+		ref = fmt.Sprintf("%s%s", stream.Status.DockerImageRepository, tag)

+	}

+	return ref, nil

+}

+

 // BuildPodController watches pods running builds and manages the build state

 type BuildPodController struct {

 	BuildStore   cache.Store

@@ -395,6 +395,9 @@ func TestHandleBuild(t *testing.T) {

 			if build.Spec.Output.To.Name != tc.outputSpec {

 				t.Errorf("(%d) expected build sent to strategy to have docker spec %s, got %s", i, tc.outputSpec, build.Spec.Output.To.Name)

 			}

+			if build.Status.OutputDockerImageReference != tc.outputSpec {

+				t.Errorf("(%d) expected build status to have OutputDockerImageReference %s, got %s", i, tc.outputSpec, build.Status.OutputDockerImageReference)

+			}

 		}

 	}

 }