@@ -184,6 +184,10 @@ message BuildOutput {

   // up the authentication for executing the Docker push to authentication

   // enabled Docker Registry (or Docker Hub).

   optional k8s.io.kubernetes.pkg.api.v1.LocalObjectReference pushSecret = 2;

+

+  // imageLabels define a list of labels that are applied to the resulting image. If there

+  // are multiple labels with the same name then the last one in the list is used.

+  repeated ImageLabel imageLabels = 3;

 }

 // A BuildPostCommitSpec holds a build post commit hook specification. The hook

@@ -641,6 +645,15 @@ message ImageChangeTrigger {

   optional k8s.io.kubernetes.pkg.api.v1.ObjectReference from = 2;

 }

+// ImageLabel represents a label applied to the resulting image.

+message ImageLabel {

+  // name defines the name of the label. It must have non-zero length.

+  optional string name = 1;

+

+  // value defines the literal value of the label.

+  optional string value = 2;

+}

+

 // ImageSource is used to describe build source that will be extracted from an image. A reference of

 // type ImageStreamTag, ImageStreamImage or DockerImage may be used. A pull secret can be specified

 // to pull the image from an external registry or override the default service account secret if pulling

@@ -22071,6 +22071,30 @@

      "pushSecret": {

       "$ref": "v1.LocalObjectReference",

       "description": "PushSecret is the name of a Secret that would be used for setting up the authentication for executing the Docker push to authentication enabled Docker Registry (or Docker Hub)."

+     },

+     "imageLabels": {

+      "type": "array",

+      "items": {

+       "$ref": "v1.ImageLabel"

+      },

+      "description": "imageLabels define a list of labels that are applied to the resulting image. If there are multiple labels with the same name then the last one in the list is used."

+     }

+    }

+   },

+   "v1.ImageLabel": {

+    "id": "v1.ImageLabel",

+    "description": "ImageLabel represents a label applied to the resulting image.",

+    "required": [

+     "name"

+    ],

+    "properties": {

+     "name": {

+      "type": "string",

+      "description": "name defines the name of the label. It must have non-zero length."

+     },

+     "value": {

+      "type": "string",

+      "description": "value defines the literal value of the label."

      }

     }

    },

@@ -44770,6 +44770,13 @@

    "v1.BuildOutput": {

     "description": "BuildOutput is input to a build strategy and describes the Docker image that the strategy should produce.",

     "properties": {

+     "imageLabels": {

+      "description": "imageLabels define a list of labels that are applied to the resulting image. If there are multiple labels with the same name then the last one in the list is used.",

+      "type": "array",

+      "items": {

+       "$ref": "#/definitions/v1.ImageLabel"

+      }

+     },

      "pushSecret": {

       "$ref": "#/definitions/v1.LocalObjectReference"

      },

@@ -47742,6 +47749,22 @@

      }

     }

    },

+   "v1.ImageLabel": {

+    "description": "ImageLabel represents a label applied to the resulting image.",

+    "required": [

+     "name"

+    ],

+    "properties": {

+     "name": {

+      "description": "name defines the name of the label. It must have non-zero length.",

+      "type": "string"

+     },

+     "value": {

+      "description": "value defines the literal value of the label.",

+      "type": "string"

+     }

+    }

+   },

    "v1.ImageLayer": {

     "description": "ImageLayer represents a single layer of the image. Some images may have multiple layers. Some may have none.",

     "required": [

@@ -88,6 +88,12 @@ func (a *buildDefaults) applyBuildDefaults(build *buildapi.Build) {

 		addDefaultEnvVar(envVar, buildEnv)

 	}

+	// Apply default labels

+	for _, lbl := range a.defaultsConfig.ImageLabels {

+		glog.V(5).Infof("Adding default image label %s=%s to build %s/%s", lbl.Name, lbl.Value, build.Namespace, build.Name)

+		addDefaultLabel(lbl, &build.Spec.Output.ImageLabels)

+	}

+

 	sourceDefaults := a.defaultsConfig.SourceStrategyDefaults

 	sourceStrategy := build.Spec.Strategy.SourceStrategy

 	if sourceDefaults != nil && sourceDefaults.Incremental != nil && *sourceDefaults.Incremental &&

@@ -153,3 +159,15 @@ func addDefaultEnvVar(v kapi.EnvVar, envVars *[]kapi.EnvVar) {

 		*envVars = append(*envVars, v)

 	}

 }

+

+func addDefaultLabel(defaultLabel buildapi.ImageLabel, buildLabels *[]buildapi.ImageLabel) {

+	found := false

+	for _, lbl := range *buildLabels {

+		if lbl.Name == defaultLabel.Name {

+			found = true

+		}

+	}

+	if !found {

+		*buildLabels = append(*buildLabels, defaultLabel)

+	}

+}

@@ -1,6 +1,7 @@

 package defaults

 import (

+	"reflect"

 	"testing"

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

@@ -8,6 +9,7 @@ import (

 	buildadmission "github.com/openshift/origin/pkg/build/admission"

 	defaultsapi "github.com/openshift/origin/pkg/build/admission/defaults/api"

 	u "github.com/openshift/origin/pkg/build/admission/testutil"

+	buildapi "github.com/openshift/origin/pkg/build/api"

 	_ "github.com/openshift/origin/pkg/api/install"

 )

@@ -130,3 +132,137 @@ func TestIncrementalDefaults(t *testing.T) {

 	}

 }

+

+func TestLabelDefaults(t *testing.T) {

+	tests := []struct {

+		buildLabels   []buildapi.ImageLabel

+		defaultLabels []buildapi.ImageLabel

+		expected      []buildapi.ImageLabel

+	}{

+		{

+			buildLabels:   nil,

+			defaultLabels: nil,

+			expected:      nil,

+		},

+		{

+			buildLabels: nil,

+			defaultLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+			expected: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+		},

+		{

+			buildLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+			defaultLabels: nil,

+			expected: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+		},

+		{

+			buildLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+			},

+			defaultLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "public",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+			expected: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+		},

+		{

+			buildLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+			},

+			defaultLabels: []buildapi.ImageLabel{

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+			expected: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+		},

+	}

+

+	for i, test := range tests {

+		defaultsConfig := &defaultsapi.BuildDefaultsConfig{

+			ImageLabels: test.defaultLabels,

+		}

+

+		admitter := NewBuildDefaults(defaultsConfig)

+		pod := u.Pod().WithBuild(t, u.Build().WithImageLabels(test.buildLabels).AsBuild(), "v1")

+		err := admitter.Admit(pod.ToAttributes())

+		if err != nil {

+			t.Fatalf("unexpected error: %v", err)

+		}

+		build := pod.GetBuild(t)

+		if err != nil {

+			t.Fatalf("unexpected error: %v", err)

+		}

+

+		result := build.Spec.Output.ImageLabels

+		if !reflect.DeepEqual(result, test.expected) {

+			t.Errorf("expected[%d]: %v, got: %v", i, test.expected, result)

+		}

+	}

+}

@@ -3,6 +3,8 @@ package api

 import (

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

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

+

+	buildapi "github.com/openshift/origin/pkg/build/api"

 )

 // BuildDefaultsConfig controls the default information for Builds

@@ -25,6 +27,11 @@ type BuildDefaultsConfig struct {

 	// SourceStrategyDefaults are default values that apply to builds using the

 	// source strategy.

 	SourceStrategyDefaults *SourceStrategyDefaultsConfig

+

+	// ImageLabels is a list of docker labels that are applied to the resulting image.

+	// User can override a default label by providing a label with the same name in their

+	// Build/BuildConfig.

+	ImageLabels []buildapi.ImageLabel

 }

 // SourceStrategyDefaultsConfig contains values that apply to builds using the

@@ -12,6 +12,7 @@ var map_BuildDefaultsConfig = map[string]string{

 	"gitNoProxy":    "GitNoProxy is the list of domains for which the proxy should not be used",

 	"env":           "Env is a set of default environment variables that will be applied to the build if the specified variables do not exist on the build",

 	"sourceStrategyDefaults": "SourceStrategyDefaults are default values that apply to builds using the source strategy.",

+	"imageLabels":            "ImageLabels is a list of docker labels that are applied to the resulting image. User can override a default label by providing a label with the same name in their Build/BuildConfig.",

 }

 func (BuildDefaultsConfig) SwaggerDoc() map[string]string {

@@ -3,6 +3,8 @@ package v1

 import (

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

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

+

+	buildapi "github.com/openshift/origin/pkg/build/api/v1"

 )

 // BuildDefaultsConfig controls the default information for Builds

@@ -25,6 +27,11 @@ type BuildDefaultsConfig struct {

 	// SourceStrategyDefaults are default values that apply to builds using the

 	// source strategy.

 	SourceStrategyDefaults *SourceStrategyDefaultsConfig `json:"sourceStrategyDefaults,omitempty"`

+

+	// ImageLabels is a list of docker labels that are applied to the resulting image.

+	// User can override a default label by providing a label with the same name in their

+	// Build/BuildConfig.

+	ImageLabels []buildapi.ImageLabel `json:"imageLabels,omitempty"`

 }

 // SourceStrategyDefaultsConfig contains values that apply to builds using the

@@ -7,12 +7,12 @@ import (

 	buildvalidation "github.com/openshift/origin/pkg/build/api/validation"

 )

-// ValidateBuild tests required fields for a Build.

 func ValidateBuildDefaultsConfig(config *api.BuildDefaultsConfig) field.ErrorList {

 	allErrs := field.ErrorList{}

 	allErrs = append(allErrs, validateURL(config.GitHTTPProxy, field.NewPath("gitHTTPProxy"))...)

 	allErrs = append(allErrs, validateURL(config.GitHTTPSProxy, field.NewPath("gitHTTPSProxy"))...)

 	allErrs = append(allErrs, buildvalidation.ValidateStrategyEnv(config.Env, field.NewPath("env"))...)

+	allErrs = append(allErrs, buildvalidation.ValidateImageLabels(config.ImageLabels, field.NewPath("imageLabels"))...)

 	return allErrs

 }

@@ -7,6 +7,7 @@ import (

 	"k8s.io/kubernetes/pkg/util/validation/field"

 	defaultsapi "github.com/openshift/origin/pkg/build/admission/defaults/api"

+	buildapi "github.com/openshift/origin/pkg/build/api"

 )

 func TestValidateBuildDefaultsConfig(t *testing.T) {

@@ -97,6 +98,52 @@ func TestValidateBuildDefaultsConfig(t *testing.T) {

 			errField:    "env[0].valueFrom",

 			errType:     field.ErrorTypeInvalid,

 		},

+		// 6: label: empty name

+		{

+			config: &defaultsapi.BuildDefaultsConfig{

+				ImageLabels: []buildapi.ImageLabel{

+					{

+						Name:  "",

+						Value: "empty",

+					},

+				},

+			},

+			errExpected: true,

+			errField:    "imageLabels[0].name",

+			errType:     field.ErrorTypeRequired,

+		},

+		// 7: label: bad name

+		{

+			config: &defaultsapi.BuildDefaultsConfig{

+				ImageLabels: []buildapi.ImageLabel{

+					{

+						Name:  "\tč;",

+						Value: "????",

+					},

+				},

+			},

+			errExpected: true,

+			errField:    "imageLabels[0].name",

+			errType:     field.ErrorTypeInvalid,

+		},

+		// 8: duplicate label

+		{

+			config: &defaultsapi.BuildDefaultsConfig{

+				ImageLabels: []buildapi.ImageLabel{

+					{

+						Name:  "name",

+						Value: "Jan",

+					},

+					{

+						Name:  "name",

+						Value: "Elvis",

+					},

+				},

+			},

+			errExpected: true,

+			errField:    "imageLabels[1].name",

+			errType:     field.ErrorTypeInvalid,

+		},

 	}

 	for i, tc := range tests {

@@ -10,6 +10,8 @@ import (

 	buildadmission "github.com/openshift/origin/pkg/build/admission"

 	overridesapi "github.com/openshift/origin/pkg/build/admission/overrides/api"

+	"github.com/openshift/origin/pkg/build/admission/overrides/api/validation"

+	buildapi "github.com/openshift/origin/pkg/build/api"

 )

 func init() {

@@ -30,6 +32,10 @@ func getConfig(in io.Reader) (*overridesapi.BuildOverridesConfig, error) {

 	if err != nil {

 		return nil, err

 	}

+	errs := validation.ValidateBuildOverridesConfig(overridesConfig)

+	if len(errs) > 0 {

+		return nil, errs.ToAggregate()

+	}

 	return overridesConfig, nil

 }

@@ -59,14 +65,28 @@ func (a *buildOverrides) Admit(attributes admission.Attributes) error {

 }

 func (a *buildOverrides) applyOverrides(attributes admission.Attributes) error {

-	if !a.overridesConfig.ForcePull {

-		return nil

-	}

 	build, version, err := buildadmission.GetBuild(attributes)

 	if err != nil {

 		return err

 	}

 	glog.V(4).Infof("Handling build %s/%s", build.Namespace, build.Name)

+

+	if a.overridesConfig.ForcePull {

+		if err := applyForcePullToBuild(build, attributes); err != nil {

+			return err

+		}

+	}

+

+	// Apply label overrides

+	for _, lbl := range a.overridesConfig.ImageLabels {

+		glog.V(5).Infof("Overriding image label %s=%s in build %s/%s", lbl.Name, lbl.Value, build.Namespace, build.Name)

+		overrideLabel(lbl, &build.Spec.Output.ImageLabels)

+	}

+

+	return buildadmission.SetBuild(attributes, build, version)

+}

+

+func applyForcePullToBuild(build *buildapi.Build, attributes admission.Attributes) error {

 	if build.Spec.Strategy.DockerStrategy != nil {

 		glog.V(5).Infof("Setting docker strategy ForcePull to true in build %s/%s", build.Namespace, build.Name)

 		build.Spec.Strategy.DockerStrategy.ForcePull = true

@@ -83,7 +103,7 @@ func (a *buildOverrides) applyOverrides(attributes admission.Attributes) error {

 		glog.V(5).Infof("Setting custom strategy ForcePull to true in build %s/%s", build.Namespace, build.Name)

 		build.Spec.Strategy.CustomStrategy.ForcePull = true

 	}

-	return buildadmission.SetBuild(attributes, build, version)

+	return nil

 }

 func applyForcePullToPod(attributes admission.Attributes) error {

@@ -101,3 +121,17 @@ func applyForcePullToPod(attributes admission.Attributes) error {

 	}

 	return nil

 }

+

+func overrideLabel(overridingLabel buildapi.ImageLabel, buildLabels *[]buildapi.ImageLabel) {

+	found := false

+	for i, lbl := range *buildLabels {

+		if lbl.Name == overridingLabel.Name {

+			glog.V(5).Infof("Replacing label %s (original value %q) with new value %q", lbl.Name, lbl.Value, overridingLabel.Value)

+			(*buildLabels)[i] = overridingLabel

+			found = true

+		}

+	}

+	if !found {

+		*buildLabels = append(*buildLabels, overridingLabel)

+	}

+}

@@ -1,6 +1,7 @@

 package overrides

 import (

+	"reflect"

 	"testing"

 	"k8s.io/kubernetes/pkg/admission"

@@ -66,3 +67,134 @@ func TestBuildOverrideForcePull(t *testing.T) {

 		}

 	}

 }

+

+func TestLabelOverrides(t *testing.T) {

+	tests := []struct {

+		buildLabels    []buildapi.ImageLabel

+		overrideLabels []buildapi.ImageLabel

+		expected       []buildapi.ImageLabel

+	}{

+		{

+			buildLabels:    nil,

+			overrideLabels: nil,

+			expected:       nil,

+		},

+		{

+			buildLabels: nil,

+			overrideLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+			expected: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+		},

+		{

+			buildLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+			overrideLabels: nil,

+			expected: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+		},

+		{

+			buildLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "public",

+				},

+			},

+			overrideLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+			expected: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+		},

+		{

+			buildLabels: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+			},

+			overrideLabels: []buildapi.ImageLabel{

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+			expected: []buildapi.ImageLabel{

+				{

+					Name:  "distribution-scope",

+					Value: "private",

+				},

+				{

+					Name:  "changelog-url",

+					Value: "file:///dev/null",

+				},

+			},

+		},

+	}

+

+	for i, test := range tests {

+		overridesConfig := &overridesapi.BuildOverridesConfig{

+			ImageLabels: test.overrideLabels,

+		}

+

+		admitter := NewBuildOverrides(overridesConfig)

+		pod := u.Pod().WithBuild(t, u.Build().WithImageLabels(test.buildLabels).AsBuild(), "v1")

+		err := admitter.Admit(pod.ToAttributes())

+		if err != nil {

+			t.Fatalf("unexpected error: %v", err)

+		}

+		build := pod.GetBuild(t)

+

+		result := build.Spec.Output.ImageLabels

+		if !reflect.DeepEqual(result, test.expected) {

+			t.Errorf("expected[%d]: %v, got: %v", i, test.expected, result)

+		}

+	}

+}

@@ -2,6 +2,8 @@ package api

 import (

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

+

+	buildapi "github.com/openshift/origin/pkg/build/api"

 )

 // BuildOverridesConfig controls override settings for builds

@@ -10,4 +12,9 @@ type BuildOverridesConfig struct {

 	// ForcePull indicates whether the build strategy should always be set to ForcePull=true

 	ForcePull bool

+

+	// ImageLabels is a list of docker labels that are applied to the resulting image.

+	// If user provided a label in their Build/BuildConfig with the same name as one in this

+	// list, the user's label will be overwritten.

+	ImageLabels []buildapi.ImageLabel

 }

@@ -6,8 +6,9 @@ package v1

 // ==== DO NOT EDIT THIS FILE MANUALLY ====

 var map_BuildOverridesConfig = map[string]string{

-	"":          "BuildOverridesConfig controls override settings for builds",

-	"forcePull": "ForcePull indicates whether the build strategy should always be set to ForcePull=true",

+	"":            "BuildOverridesConfig controls override settings for builds",

+	"forcePull":   "ForcePull indicates whether the build strategy should always be set to ForcePull=true",

+	"imageLabels": "ImageLabels is a list of docker labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.",

 }

 func (BuildOverridesConfig) SwaggerDoc() map[string]string {

@@ -2,6 +2,8 @@ package v1

 import (

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

+

+	buildapi "github.com/openshift/origin/pkg/build/api/v1"

 )

 // BuildOverridesConfig controls override settings for builds

@@ -10,4 +12,9 @@ type BuildOverridesConfig struct {

 	// ForcePull indicates whether the build strategy should always be set to ForcePull=true

 	ForcePull bool `json:"forcePull"`

+

+	// ImageLabels is a list of docker labels that are applied to the resulting image.

+	// If user provided a label in their Build/BuildConfig with the same name as one in this

+	// list, the user's label will be overwritten.

+	ImageLabels []buildapi.ImageLabel `json:"imageLabels,omitempty"`

 }

new file mode 100644

@@ -0,0 +1,14 @@

+package validation

+

+import (

+	"k8s.io/kubernetes/pkg/util/validation/field"

+

+	"github.com/openshift/origin/pkg/build/admission/overrides/api"

+	buildvalidation "github.com/openshift/origin/pkg/build/api/validation"

+)

+

+func ValidateBuildOverridesConfig(config *api.BuildOverridesConfig) field.ErrorList {

+	allErrs := field.ErrorList{}

+	allErrs = append(allErrs, buildvalidation.ValidateImageLabels(config.ImageLabels, field.NewPath("imageLabels"))...)

+	return allErrs

+}

@@ -49,6 +49,11 @@ func (b *TestBuild) WithCustomStrategy() *TestBuild {

 	return b

 }

+func (b *TestBuild) WithImageLabels(labels []buildapi.ImageLabel) *TestBuild {

+	b.Spec.Output.ImageLabels = labels

+	return b

+}

+

 func (b *TestBuild) AsBuild() *buildapi.Build {

 	return (*buildapi.Build)(b)

 }

@@ -661,6 +661,19 @@ type BuildOutput struct {

 	// up the authentication for executing the Docker push to authentication

 	// enabled Docker Registry (or Docker Hub).

 	PushSecret *kapi.LocalObjectReference

+

+	// ImageLabels define a list of labels that are applied to the resulting image. If there

+	// are multiple labels with the same name then the last one in the list is used.

+	ImageLabels []ImageLabel

+}

+

+// ImageLabel represents a label applied to the resulting image.

+type ImageLabel struct {

+	// Name defines the name of the label. It must have non-zero length.

+	Name string

+

+	// Value defines the literal value of the label.

+	Value string

 }

 // BuildConfig is a template which can be used to create new builds.

@@ -39,6 +39,7 @@

 		GitSourceRevision

 		ImageChangeCause

 		ImageChangeTrigger

+		ImageLabel

 		ImageSource

 		ImageSourcePath

 		JenkinsPipelineBuildStrategy

@@ -197,47 +198,51 @@ func (m *ImageChangeTrigger) Reset()                    { *m = ImageChangeTrigge

 func (*ImageChangeTrigger) ProtoMessage()               {}

 func (*ImageChangeTrigger) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{29} }

+func (m *ImageLabel) Reset()                    { *m = ImageLabel{} }

+func (*ImageLabel) ProtoMessage()               {}

+func (*ImageLabel) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{30} }

+

 func (m *ImageSource) Reset()                    { *m = ImageSource{} }

 func (*ImageSource) ProtoMessage()               {}

-func (*ImageSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{30} }

+func (*ImageSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{31} }

 func (m *ImageSourcePath) Reset()                    { *m = ImageSourcePath{} }

 func (*ImageSourcePath) ProtoMessage()               {}

-func (*ImageSourcePath) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{31} }

+func (*ImageSourcePath) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{32} }

 func (m *JenkinsPipelineBuildStrategy) Reset()      { *m = JenkinsPipelineBuildStrategy{} }

 func (*JenkinsPipelineBuildStrategy) ProtoMessage() {}

 func (*JenkinsPipelineBuildStrategy) Descriptor() ([]byte, []int) {

-	return fileDescriptorGenerated, []int{32}

+	return fileDescriptorGenerated, []int{33}

 }

 func (m *ProxyConfig) Reset()                    { *m = ProxyConfig{} }

 func (*ProxyConfig) ProtoMessage()               {}

-func (*ProxyConfig) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{33} }

+func (*ProxyConfig) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{34} }

 func (m *SecretBuildSource) Reset()                    { *m = SecretBuildSource{} }

 func (*SecretBuildSource) ProtoMessage()               {}

-func (*SecretBuildSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{34} }

+func (*SecretBuildSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{35} }

 func (m *SecretSpec) Reset()                    { *m = SecretSpec{} }

 func (*SecretSpec) ProtoMessage()               {}

-func (*SecretSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{35} }

+func (*SecretSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{36} }

 func (m *SourceBuildStrategy) Reset()                    { *m = SourceBuildStrategy{} }

 func (*SourceBuildStrategy) ProtoMessage()               {}

-func (*SourceBuildStrategy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{36} }

+func (*SourceBuildStrategy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{37} }

 func (m *SourceControlUser) Reset()                    { *m = SourceControlUser{} }

 func (*SourceControlUser) ProtoMessage()               {}

-func (*SourceControlUser) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{37} }

+func (*SourceControlUser) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{38} }

 func (m *SourceRevision) Reset()                    { *m = SourceRevision{} }

 func (*SourceRevision) ProtoMessage()               {}

-func (*SourceRevision) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{38} }

+func (*SourceRevision) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{39} }

 func (m *WebHookTrigger) Reset()                    { *m = WebHookTrigger{} }

 func (*WebHookTrigger) ProtoMessage()               {}

-func (*WebHookTrigger) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{39} }

+func (*WebHookTrigger) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{40} }

 func init() {

 	proto.RegisterType((*BinaryBuildRequestOptions)(nil), "github.com.openshift.origin.pkg.build.api.v1.BinaryBuildRequestOptions")

@@ -270,6 +275,7 @@ func init() {

 	proto.RegisterType((*GitSourceRevision)(nil), "github.com.openshift.origin.pkg.build.api.v1.GitSourceRevision")

 	proto.RegisterType((*ImageChangeCause)(nil), "github.com.openshift.origin.pkg.build.api.v1.ImageChangeCause")

 	proto.RegisterType((*ImageChangeTrigger)(nil), "github.com.openshift.origin.pkg.build.api.v1.ImageChangeTrigger")

+	proto.RegisterType((*ImageLabel)(nil), "github.com.openshift.origin.pkg.build.api.v1.ImageLabel")

 	proto.RegisterType((*ImageSource)(nil), "github.com.openshift.origin.pkg.build.api.v1.ImageSource")

 	proto.RegisterType((*ImageSourcePath)(nil), "github.com.openshift.origin.pkg.build.api.v1.ImageSourcePath")

 	proto.RegisterType((*JenkinsPipelineBuildStrategy)(nil), "github.com.openshift.origin.pkg.build.api.v1.JenkinsPipelineBuildStrategy")

@@ -717,6 +723,18 @@ func (m *BuildOutput) MarshalTo(data []byte) (int, error) {

 		}

 		i += n13

 	}

+	if len(m.ImageLabels) > 0 {

+		for _, msg := range m.ImageLabels {

+			data[i] = 0x1a

+			i++

+			i = encodeVarintGenerated(data, i, uint64(msg.Size()))

+			n, err := msg.MarshalTo(data[i:])

+			if err != nil {

+				return 0, err

+			}

+			i += n

+		}

+	}

 	return i, nil

 }

@@ -1741,6 +1759,32 @@ func (m *ImageChangeTrigger) MarshalTo(data []byte) (int, error) {

 	return i, nil

 }

+func (m *ImageLabel) Marshal() (data []byte, err error) {

+	size := m.Size()

+	data = make([]byte, size)

+	n, err := m.MarshalTo(data)

+	if err != nil {

+		return nil, err

+	}

+	return data[:n], nil

+}

+

+func (m *ImageLabel) MarshalTo(data []byte) (int, error) {

+	var i int

+	_ = i

+	var l int

+	_ = l

+	data[i] = 0xa

+	i++

+	i = encodeVarintGenerated(data, i, uint64(len(m.Name)))

+	i += copy(data[i:], m.Name)

+	data[i] = 0x12

+	i++

+	i = encodeVarintGenerated(data, i, uint64(len(m.Value)))

+	i += copy(data[i:], m.Value)

+	return i, nil

+}

+

 func (m *ImageSource) Marshal() (data []byte, err error) {

 	size := m.Size()

 	data = make([]byte, size)

@@ -2294,6 +2338,12 @@ func (m *BuildOutput) Size() (n int) {

 		l = m.PushSecret.Size()

 		n += 1 + l + sovGenerated(uint64(l))

 	}

+	if len(m.ImageLabels) > 0 {

+		for _, e := range m.ImageLabels {