@@ -944,7 +944,6 @@ func deepCopy_api_BuildRequest(in buildapi.BuildRequest, out *buildapi.BuildRequ

 }

 func deepCopy_api_BuildSource(in buildapi.BuildSource, out *buildapi.BuildSource, c *conversion.Cloner) error {

-	out.Type = in.Type

 	if in.Binary != nil {

 		out.Binary = new(buildapi.BinaryBuildSource)

 		if err := deepCopy_api_BinaryBuildSource(*in.Binary, out.Binary, c); err != nil {

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

 }

 func deepCopy_api_BuildStrategy(in buildapi.BuildStrategy, out *buildapi.BuildStrategy, c *conversion.Cloner) error {

-	out.Type = in.Type

 	if in.DockerStrategy != nil {

 		out.DockerStrategy = new(buildapi.DockerBuildStrategy)

 		if err := deepCopy_api_DockerBuildStrategy(*in.DockerStrategy, out.DockerStrategy, c); err != nil {

@@ -1270,7 +1268,6 @@ func deepCopy_api_SourceControlUser(in buildapi.SourceControlUser, out *buildapi

 }

 func deepCopy_api_SourceRevision(in buildapi.SourceRevision, out *buildapi.SourceRevision, c *conversion.Cloner) error {

-	out.Type = in.Type

 	if in.Git != nil {

 		out.Git = new(buildapi.GitSourceRevision)

 		if err := deepCopy_api_GitSourceRevision(*in.Git, out.Git, c); err != nil {

@@ -204,7 +204,6 @@ func TestGraph(t *testing.T) {

 			},

 			BuildSpec: buildapi.BuildSpec{

 				Strategy: buildapi.BuildStrategy{

-					Type: buildapi.SourceBuildStrategyType,

 					SourceStrategy: &buildapi.SourceBuildStrategy{

 						From: kapi.ObjectReference{Kind: "ImageStreamTag", Name: "test:base-image"},

 					},

@@ -1339,8 +1339,7 @@ func autoconvert_api_BuildRequest_To_v1_BuildRequest(in *buildapi.BuildRequest,

 		return err

 	}

 	if in.Revision != nil {

-		out.Revision = new(apiv1.SourceRevision)

-		if err := convert_api_SourceRevision_To_v1_SourceRevision(in.Revision, out.Revision, s); err != nil {

+		if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {

 			return err

 		}

 	} else {

@@ -1397,7 +1396,6 @@ func autoconvert_api_BuildSource_To_v1_BuildSource(in *buildapi.BuildSource, out

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.BuildSource))(in)

 	}

-	out.Type = apiv1.BuildSourceType(in.Type)

 	if in.Binary != nil {

 		out.Binary = new(apiv1.BinaryBuildSource)

 		if err := convert_api_BinaryBuildSource_To_v1_BinaryBuildSource(in.Binary, out.Binary, s); err != nil {

@@ -1432,27 +1430,22 @@ func autoconvert_api_BuildSource_To_v1_BuildSource(in *buildapi.BuildSource, out

 	return nil

 }

-func convert_api_BuildSource_To_v1_BuildSource(in *buildapi.BuildSource, out *apiv1.BuildSource, s conversion.Scope) error {

-	return autoconvert_api_BuildSource_To_v1_BuildSource(in, out, s)

-}

-

 func autoconvert_api_BuildSpec_To_v1_BuildSpec(in *buildapi.BuildSpec, out *apiv1.BuildSpec, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.BuildSpec))(in)

 	}

 	out.ServiceAccount = in.ServiceAccount

-	if err := convert_api_BuildSource_To_v1_BuildSource(&in.Source, &out.Source, s); err != nil {

+	if err := s.Convert(&in.Source, &out.Source, 0); err != nil {

 		return err

 	}

 	if in.Revision != nil {

-		out.Revision = new(apiv1.SourceRevision)

-		if err := convert_api_SourceRevision_To_v1_SourceRevision(in.Revision, out.Revision, s); err != nil {

+		if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {

 			return err

 		}

 	} else {

 		out.Revision = nil

 	}

-	if err := convert_api_BuildStrategy_To_v1_BuildStrategy(&in.Strategy, &out.Strategy, s); err != nil {

+	if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {

 		return err

 	}

 	if err := s.Convert(&in.Output, &out.Output, 0); err != nil {

@@ -1517,7 +1510,6 @@ func autoconvert_api_BuildStrategy_To_v1_BuildStrategy(in *buildapi.BuildStrateg

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.BuildStrategy))(in)

 	}

-	out.Type = apiv1.BuildStrategyType(in.Type)

 	if in.DockerStrategy != nil {

 		if err := s.Convert(&in.DockerStrategy, &out.DockerStrategy, 0); err != nil {

 			return err

@@ -1542,10 +1534,6 @@ func autoconvert_api_BuildStrategy_To_v1_BuildStrategy(in *buildapi.BuildStrateg

 	return nil

 }

-func convert_api_BuildStrategy_To_v1_BuildStrategy(in *buildapi.BuildStrategy, out *apiv1.BuildStrategy, s conversion.Scope) error {

-	return autoconvert_api_BuildStrategy_To_v1_BuildStrategy(in, out, s)

-}

-

 func autoconvert_api_BuildTriggerPolicy_To_v1_BuildTriggerPolicy(in *buildapi.BuildTriggerPolicy, out *apiv1.BuildTriggerPolicy, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.BuildTriggerPolicy))(in)

@@ -1770,7 +1758,6 @@ func autoconvert_api_SourceRevision_To_v1_SourceRevision(in *buildapi.SourceRevi

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.SourceRevision))(in)

 	}

-	out.Type = apiv1.BuildSourceType(in.Type)

 	if in.Git != nil {

 		out.Git = new(apiv1.GitSourceRevision)

 		if err := convert_api_GitSourceRevision_To_v1_GitSourceRevision(in.Git, out.Git, s); err != nil {

@@ -1782,10 +1769,6 @@ func autoconvert_api_SourceRevision_To_v1_SourceRevision(in *buildapi.SourceRevi

 	return nil

 }

-func convert_api_SourceRevision_To_v1_SourceRevision(in *buildapi.SourceRevision, out *apiv1.SourceRevision, s conversion.Scope) error {

-	return autoconvert_api_SourceRevision_To_v1_SourceRevision(in, out, s)

-}

-

 func autoconvert_api_WebHookTrigger_To_v1_WebHookTrigger(in *buildapi.WebHookTrigger, out *apiv1.WebHookTrigger, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.WebHookTrigger))(in)

@@ -2068,8 +2051,7 @@ func autoconvert_v1_BuildRequest_To_api_BuildRequest(in *apiv1.BuildRequest, out

 		return err

 	}

 	if in.Revision != nil {

-		out.Revision = new(buildapi.SourceRevision)

-		if err := convert_v1_SourceRevision_To_api_SourceRevision(in.Revision, out.Revision, s); err != nil {

+		if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {

 			return err

 		}

 	} else {

@@ -2126,7 +2108,7 @@ func autoconvert_v1_BuildSource_To_api_BuildSource(in *apiv1.BuildSource, out *b

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1.BuildSource))(in)

 	}

-	out.Type = buildapi.BuildSourceType(in.Type)

+	// in.Type has no peer in out

 	if in.Binary != nil {

 		out.Binary = new(buildapi.BinaryBuildSource)

 		if err := convert_v1_BinaryBuildSource_To_api_BinaryBuildSource(in.Binary, out.Binary, s); err != nil {

@@ -2161,27 +2143,22 @@ func autoconvert_v1_BuildSource_To_api_BuildSource(in *apiv1.BuildSource, out *b

 	return nil

 }

-func convert_v1_BuildSource_To_api_BuildSource(in *apiv1.BuildSource, out *buildapi.BuildSource, s conversion.Scope) error {

-	return autoconvert_v1_BuildSource_To_api_BuildSource(in, out, s)

-}

-

 func autoconvert_v1_BuildSpec_To_api_BuildSpec(in *apiv1.BuildSpec, out *buildapi.BuildSpec, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1.BuildSpec))(in)

 	}

 	out.ServiceAccount = in.ServiceAccount

-	if err := convert_v1_BuildSource_To_api_BuildSource(&in.Source, &out.Source, s); err != nil {

+	if err := s.Convert(&in.Source, &out.Source, 0); err != nil {

 		return err

 	}

 	if in.Revision != nil {

-		out.Revision = new(buildapi.SourceRevision)

-		if err := convert_v1_SourceRevision_To_api_SourceRevision(in.Revision, out.Revision, s); err != nil {

+		if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {

 			return err

 		}

 	} else {

 		out.Revision = nil

 	}

-	if err := convert_v1_BuildStrategy_To_api_BuildStrategy(&in.Strategy, &out.Strategy, s); err != nil {

+	if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {

 		return err

 	}

 	if err := s.Convert(&in.Output, &out.Output, 0); err != nil {

@@ -2246,7 +2223,7 @@ func autoconvert_v1_BuildStrategy_To_api_BuildStrategy(in *apiv1.BuildStrategy,

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1.BuildStrategy))(in)

 	}

-	out.Type = buildapi.BuildStrategyType(in.Type)

+	// in.Type has no peer in out

 	if in.DockerStrategy != nil {

 		if err := s.Convert(&in.DockerStrategy, &out.DockerStrategy, 0); err != nil {

 			return err

@@ -2271,10 +2248,6 @@ func autoconvert_v1_BuildStrategy_To_api_BuildStrategy(in *apiv1.BuildStrategy,

 	return nil

 }

-func convert_v1_BuildStrategy_To_api_BuildStrategy(in *apiv1.BuildStrategy, out *buildapi.BuildStrategy, s conversion.Scope) error {

-	return autoconvert_v1_BuildStrategy_To_api_BuildStrategy(in, out, s)

-}

-

 func autoconvert_v1_BuildTriggerPolicy_To_api_BuildTriggerPolicy(in *apiv1.BuildTriggerPolicy, out *buildapi.BuildTriggerPolicy, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1.BuildTriggerPolicy))(in)

@@ -2499,7 +2472,7 @@ func autoconvert_v1_SourceRevision_To_api_SourceRevision(in *apiv1.SourceRevisio

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1.SourceRevision))(in)

 	}

-	out.Type = buildapi.BuildSourceType(in.Type)

+	// in.Type has no peer in out

 	if in.Git != nil {

 		out.Git = new(buildapi.GitSourceRevision)

 		if err := convert_v1_GitSourceRevision_To_api_GitSourceRevision(in.Git, out.Git, s); err != nil {

@@ -2511,10 +2484,6 @@ func autoconvert_v1_SourceRevision_To_api_SourceRevision(in *apiv1.SourceRevisio

 	return nil

 }

-func convert_v1_SourceRevision_To_api_SourceRevision(in *apiv1.SourceRevision, out *buildapi.SourceRevision, s conversion.Scope) error {

-	return autoconvert_v1_SourceRevision_To_api_SourceRevision(in, out, s)

-}

-

 func autoconvert_v1_WebHookTrigger_To_api_WebHookTrigger(in *apiv1.WebHookTrigger, out *buildapi.WebHookTrigger, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1.WebHookTrigger))(in)

@@ -1348,8 +1348,7 @@ func autoconvert_api_BuildRequest_To_v1beta3_BuildRequest(in *buildapi.BuildRequ

 		return err

 	}

 	if in.Revision != nil {

-		out.Revision = new(apiv1beta3.SourceRevision)

-		if err := convert_api_SourceRevision_To_v1beta3_SourceRevision(in.Revision, out.Revision, s); err != nil {

+		if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {

 			return err

 		}

 	} else {

@@ -1406,7 +1405,6 @@ func autoconvert_api_BuildSource_To_v1beta3_BuildSource(in *buildapi.BuildSource

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.BuildSource))(in)

 	}

-	out.Type = apiv1beta3.BuildSourceType(in.Type)

 	if in.Binary != nil {

 		out.Binary = new(apiv1beta3.BinaryBuildSource)

 		if err := convert_api_BinaryBuildSource_To_v1beta3_BinaryBuildSource(in.Binary, out.Binary, s); err != nil {

@@ -1441,27 +1439,22 @@ func autoconvert_api_BuildSource_To_v1beta3_BuildSource(in *buildapi.BuildSource

 	return nil

 }

-func convert_api_BuildSource_To_v1beta3_BuildSource(in *buildapi.BuildSource, out *apiv1beta3.BuildSource, s conversion.Scope) error {

-	return autoconvert_api_BuildSource_To_v1beta3_BuildSource(in, out, s)

-}

-

 func autoconvert_api_BuildSpec_To_v1beta3_BuildSpec(in *buildapi.BuildSpec, out *apiv1beta3.BuildSpec, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.BuildSpec))(in)

 	}

 	out.ServiceAccount = in.ServiceAccount

-	if err := convert_api_BuildSource_To_v1beta3_BuildSource(&in.Source, &out.Source, s); err != nil {

+	if err := s.Convert(&in.Source, &out.Source, 0); err != nil {

 		return err

 	}

 	if in.Revision != nil {

-		out.Revision = new(apiv1beta3.SourceRevision)

-		if err := convert_api_SourceRevision_To_v1beta3_SourceRevision(in.Revision, out.Revision, s); err != nil {

+		if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {

 			return err

 		}

 	} else {

 		out.Revision = nil

 	}

-	if err := convert_api_BuildStrategy_To_v1beta3_BuildStrategy(&in.Strategy, &out.Strategy, s); err != nil {

+	if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {

 		return err

 	}

 	if err := s.Convert(&in.Output, &out.Output, 0); err != nil {

@@ -1526,7 +1519,6 @@ func autoconvert_api_BuildStrategy_To_v1beta3_BuildStrategy(in *buildapi.BuildSt

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.BuildStrategy))(in)

 	}

-	out.Type = apiv1beta3.BuildStrategyType(in.Type)

 	if in.DockerStrategy != nil {

 		if err := s.Convert(&in.DockerStrategy, &out.DockerStrategy, 0); err != nil {

 			return err

@@ -1551,10 +1543,6 @@ func autoconvert_api_BuildStrategy_To_v1beta3_BuildStrategy(in *buildapi.BuildSt

 	return nil

 }

-func convert_api_BuildStrategy_To_v1beta3_BuildStrategy(in *buildapi.BuildStrategy, out *apiv1beta3.BuildStrategy, s conversion.Scope) error {

-	return autoconvert_api_BuildStrategy_To_v1beta3_BuildStrategy(in, out, s)

-}

-

 func autoconvert_api_BuildTriggerPolicy_To_v1beta3_BuildTriggerPolicy(in *buildapi.BuildTriggerPolicy, out *apiv1beta3.BuildTriggerPolicy, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.BuildTriggerPolicy))(in)

@@ -1779,7 +1767,6 @@ func autoconvert_api_SourceRevision_To_v1beta3_SourceRevision(in *buildapi.Sourc

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.SourceRevision))(in)

 	}

-	out.Type = apiv1beta3.BuildSourceType(in.Type)

 	if in.Git != nil {

 		out.Git = new(apiv1beta3.GitSourceRevision)

 		if err := convert_api_GitSourceRevision_To_v1beta3_GitSourceRevision(in.Git, out.Git, s); err != nil {

@@ -1791,10 +1778,6 @@ func autoconvert_api_SourceRevision_To_v1beta3_SourceRevision(in *buildapi.Sourc

 	return nil

 }

-func convert_api_SourceRevision_To_v1beta3_SourceRevision(in *buildapi.SourceRevision, out *apiv1beta3.SourceRevision, s conversion.Scope) error {

-	return autoconvert_api_SourceRevision_To_v1beta3_SourceRevision(in, out, s)

-}

-

 func autoconvert_api_WebHookTrigger_To_v1beta3_WebHookTrigger(in *buildapi.WebHookTrigger, out *apiv1beta3.WebHookTrigger, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*buildapi.WebHookTrigger))(in)

@@ -2077,8 +2060,7 @@ func autoconvert_v1beta3_BuildRequest_To_api_BuildRequest(in *apiv1beta3.BuildRe

 		return err

 	}

 	if in.Revision != nil {

-		out.Revision = new(buildapi.SourceRevision)

-		if err := convert_v1beta3_SourceRevision_To_api_SourceRevision(in.Revision, out.Revision, s); err != nil {

+		if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {

 			return err

 		}

 	} else {

@@ -2135,7 +2117,7 @@ func autoconvert_v1beta3_BuildSource_To_api_BuildSource(in *apiv1beta3.BuildSour

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1beta3.BuildSource))(in)

 	}

-	out.Type = buildapi.BuildSourceType(in.Type)

+	// in.Type has no peer in out

 	if in.Binary != nil {

 		out.Binary = new(buildapi.BinaryBuildSource)

 		if err := convert_v1beta3_BinaryBuildSource_To_api_BinaryBuildSource(in.Binary, out.Binary, s); err != nil {

@@ -2170,27 +2152,22 @@ func autoconvert_v1beta3_BuildSource_To_api_BuildSource(in *apiv1beta3.BuildSour

 	return nil

 }

-func convert_v1beta3_BuildSource_To_api_BuildSource(in *apiv1beta3.BuildSource, out *buildapi.BuildSource, s conversion.Scope) error {

-	return autoconvert_v1beta3_BuildSource_To_api_BuildSource(in, out, s)

-}

-

 func autoconvert_v1beta3_BuildSpec_To_api_BuildSpec(in *apiv1beta3.BuildSpec, out *buildapi.BuildSpec, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1beta3.BuildSpec))(in)

 	}

 	out.ServiceAccount = in.ServiceAccount

-	if err := convert_v1beta3_BuildSource_To_api_BuildSource(&in.Source, &out.Source, s); err != nil {

+	if err := s.Convert(&in.Source, &out.Source, 0); err != nil {

 		return err

 	}

 	if in.Revision != nil {

-		out.Revision = new(buildapi.SourceRevision)

-		if err := convert_v1beta3_SourceRevision_To_api_SourceRevision(in.Revision, out.Revision, s); err != nil {

+		if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {

 			return err

 		}

 	} else {

 		out.Revision = nil

 	}

-	if err := convert_v1beta3_BuildStrategy_To_api_BuildStrategy(&in.Strategy, &out.Strategy, s); err != nil {

+	if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {

 		return err

 	}

 	if err := s.Convert(&in.Output, &out.Output, 0); err != nil {

@@ -2255,7 +2232,7 @@ func autoconvert_v1beta3_BuildStrategy_To_api_BuildStrategy(in *apiv1beta3.Build

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1beta3.BuildStrategy))(in)

 	}

-	out.Type = buildapi.BuildStrategyType(in.Type)

+	// in.Type has no peer in out

 	if in.DockerStrategy != nil {

 		if err := s.Convert(&in.DockerStrategy, &out.DockerStrategy, 0); err != nil {

 			return err

@@ -2280,10 +2257,6 @@ func autoconvert_v1beta3_BuildStrategy_To_api_BuildStrategy(in *apiv1beta3.Build

 	return nil

 }

-func convert_v1beta3_BuildStrategy_To_api_BuildStrategy(in *apiv1beta3.BuildStrategy, out *buildapi.BuildStrategy, s conversion.Scope) error {

-	return autoconvert_v1beta3_BuildStrategy_To_api_BuildStrategy(in, out, s)

-}

-

 func autoconvert_v1beta3_BuildTriggerPolicy_To_api_BuildTriggerPolicy(in *apiv1beta3.BuildTriggerPolicy, out *buildapi.BuildTriggerPolicy, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1beta3.BuildTriggerPolicy))(in)

@@ -2508,7 +2481,7 @@ func autoconvert_v1beta3_SourceRevision_To_api_SourceRevision(in *apiv1beta3.Sou

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1beta3.SourceRevision))(in)

 	}

-	out.Type = buildapi.BuildSourceType(in.Type)

+	// in.Type has no peer in out

 	if in.Git != nil {

 		out.Git = new(buildapi.GitSourceRevision)

 		if err := convert_v1beta3_GitSourceRevision_To_api_GitSourceRevision(in.Git, out.Git, s); err != nil {

@@ -2520,10 +2493,6 @@ func autoconvert_v1beta3_SourceRevision_To_api_SourceRevision(in *apiv1beta3.Sou

 	return nil

 }

-func convert_v1beta3_SourceRevision_To_api_SourceRevision(in *apiv1beta3.SourceRevision, out *buildapi.SourceRevision, s conversion.Scope) error {

-	return autoconvert_v1beta3_SourceRevision_To_api_SourceRevision(in, out, s)

-}

-

 func autoconvert_v1beta3_WebHookTrigger_To_api_WebHookTrigger(in *apiv1beta3.WebHookTrigger, out *buildapi.WebHookTrigger, s conversion.Scope) error {

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*apiv1beta3.WebHookTrigger))(in)

@@ -61,18 +61,16 @@ func (a *buildByStrategy) Admit(attr admission.Attributes) error {

 	}

 }

-func resourceForStrategyType(strategyType buildapi.BuildStrategyType) string {

-	var resource string

-	switch strategyType {

-	case buildapi.DockerBuildStrategyType:

-		resource = authorizationapi.DockerBuildResource

-	case buildapi.CustomBuildStrategyType:

-		resource = authorizationapi.CustomBuildResource

-	case buildapi.SourceBuildStrategyType:

-		resource = authorizationapi.SourceBuildResource

+func resourceForStrategyType(strategy buildapi.BuildStrategy) string {

+	switch {

+	case strategy.DockerStrategy != nil:

+		return authorizationapi.DockerBuildResource

+	case strategy.CustomStrategy != nil:

+		return authorizationapi.CustomBuildResource

+	case strategy.SourceStrategy != nil:

+		return authorizationapi.SourceBuildResource

 	}

-	return resource

-

+	return ""

 }

 func resourceName(objectMeta kapi.ObjectMeta) string {

@@ -83,33 +81,33 @@ func resourceName(objectMeta kapi.ObjectMeta) string {

 }

 func (a *buildByStrategy) checkBuildAuthorization(build *buildapi.Build, attr admission.Attributes) error {

-	strategyType := build.Spec.Strategy.Type

+	strategy := build.Spec.Strategy

 	subjectAccessReview := &authorizationapi.LocalSubjectAccessReview{

 		Action: authorizationapi.AuthorizationAttributes{

 			Verb:         "create",

-			Resource:     resourceForStrategyType(strategyType),

+			Resource:     resourceForStrategyType(strategy),

 			Content:      runtime.EmbeddedObject{Object: build},

 			ResourceName: resourceName(build.ObjectMeta),

 		},

 		User:   attr.GetUserInfo().GetName(),

 		Groups: sets.NewString(attr.GetUserInfo().GetGroups()...),

 	}

-	return a.checkAccess(strategyType, subjectAccessReview, attr)

+	return a.checkAccess(strategy, subjectAccessReview, attr)

 }

 func (a *buildByStrategy) checkBuildConfigAuthorization(buildConfig *buildapi.BuildConfig, attr admission.Attributes) error {

-	strategyType := buildConfig.Spec.Strategy.Type

+	strategy := buildConfig.Spec.Strategy

 	subjectAccessReview := &authorizationapi.LocalSubjectAccessReview{

 		Action: authorizationapi.AuthorizationAttributes{

 			Verb:         "create",

-			Resource:     resourceForStrategyType(strategyType),

+			Resource:     resourceForStrategyType(strategy),

 			Content:      runtime.EmbeddedObject{Object: buildConfig},

 			ResourceName: resourceName(buildConfig.ObjectMeta),

 		},

 		User:   attr.GetUserInfo().GetName(),

 		Groups: sets.NewString(attr.GetUserInfo().GetGroups()...),

 	}

-	return a.checkAccess(strategyType, subjectAccessReview, attr)

+	return a.checkAccess(strategy, subjectAccessReview, attr)

 }

 func (a *buildByStrategy) checkBuildRequestAuthorization(req *buildapi.BuildRequest, attr admission.Attributes) error {

@@ -131,17 +129,17 @@ func (a *buildByStrategy) checkBuildRequestAuthorization(req *buildapi.BuildRequ

 	}

 }

-func (a *buildByStrategy) checkAccess(strategyType buildapi.BuildStrategyType, subjectAccessReview *authorizationapi.LocalSubjectAccessReview, attr admission.Attributes) error {

+func (a *buildByStrategy) checkAccess(strategy buildapi.BuildStrategy, subjectAccessReview *authorizationapi.LocalSubjectAccessReview, attr admission.Attributes) error {

 	resp, err := a.client.LocalSubjectAccessReviews(attr.GetNamespace()).Create(subjectAccessReview)

 	if err != nil {

 		return err

 	}

 	if !resp.Allowed {

-		return notAllowed(strategyType, attr)

+		return notAllowed(strategy, attr)

 	}

 	return nil

 }

-func notAllowed(strategyType buildapi.BuildStrategyType, attr admission.Attributes) error {

-	return admission.NewForbidden(attr, fmt.Errorf("build strategy type %s is not allowed", strategyType))

+func notAllowed(strategy buildapi.BuildStrategy, attr admission.Attributes) error {

+	return admission.NewForbidden(attr, fmt.Errorf("build strategy %s is not allowed", buildapi.StrategyType(strategy)))

 }

@@ -32,7 +32,7 @@ func TestBuildAdmission(t *testing.T) {

 	}{

 		{

 			name:             "allowed source build",

-			object:           testBuild(buildapi.SourceBuildStrategyType),

+			object:           testBuild(buildapi.BuildStrategy{SourceStrategy: &buildapi.SourceBuildStrategy{}}),

 			kind:             "Build",

 			resource:         buildsResource,

 			reviewResponse:   reviewResponse(true, ""),

@@ -42,7 +42,7 @@ func TestBuildAdmission(t *testing.T) {

 		{

 			name:             "allowed source build clone",

 			object:           testBuildRequest("buildname"),

-			responseObject:   testBuild(buildapi.SourceBuildStrategyType),

+			responseObject:   testBuild(buildapi.BuildStrategy{SourceStrategy: &buildapi.SourceBuildStrategy{}}),

 			kind:             "Build",

 			resource:         buildsResource,

 			subResource:      "clone",

@@ -52,7 +52,7 @@ func TestBuildAdmission(t *testing.T) {

 		},

 		{

 			name:             "denied docker build",

-			object:           testBuild(buildapi.DockerBuildStrategyType),

+			object:           testBuild(buildapi.BuildStrategy{DockerStrategy: &buildapi.DockerBuildStrategy{}}),

 			kind:             "Build",

 			resource:         buildsResource,

 			reviewResponse:   reviewResponse(false, "cannot create build of type docker build"),

@@ -62,7 +62,7 @@ func TestBuildAdmission(t *testing.T) {

 		{

 			name:             "denied docker build clone",

 			object:           testBuildRequest("buildname"),

-			responseObject:   testBuild(buildapi.DockerBuildStrategyType),

+			responseObject:   testBuild(buildapi.BuildStrategy{DockerStrategy: &buildapi.DockerBuildStrategy{}}),

 			kind:             "Build",

 			resource:         buildsResource,

 			subResource:      "clone",

@@ -72,7 +72,7 @@ func TestBuildAdmission(t *testing.T) {

 		},

 		{

 			name:             "allowed custom build",

-			object:           testBuild(buildapi.CustomBuildStrategyType),

+			object:           testBuild(buildapi.BuildStrategy{CustomStrategy: &buildapi.CustomBuildStrategy{}}),

 			kind:             "Build",

 			resource:         buildsResource,

 			reviewResponse:   reviewResponse(true, ""),

@@ -81,7 +81,7 @@ func TestBuildAdmission(t *testing.T) {

 		},

 		{

 			name:             "allowed build config",

-			object:           testBuildConfig(buildapi.DockerBuildStrategyType),

+			object:           testBuildConfig(buildapi.BuildStrategy{DockerStrategy: &buildapi.DockerBuildStrategy{}}),

 			kind:             "BuildConfig",

 			resource:         buildConfigsResource,

 			reviewResponse:   reviewResponse(true, ""),

@@ -90,7 +90,7 @@ func TestBuildAdmission(t *testing.T) {

 		},

 		{

 			name:             "allowed build config instantiate",

-			responseObject:   testBuildConfig(buildapi.DockerBuildStrategyType),

+			responseObject:   testBuildConfig(buildapi.BuildStrategy{DockerStrategy: &buildapi.DockerBuildStrategy{}}),

 			object:           testBuildRequest("buildname"),

 			kind:             "BuildConfig",

 			resource:         buildConfigsResource,

@@ -101,7 +101,7 @@ func TestBuildAdmission(t *testing.T) {

 		},

 		{

 			name:             "forbidden build config",

-			object:           testBuildConfig(buildapi.CustomBuildStrategyType),

+			object:           testBuildConfig(buildapi.BuildStrategy{CustomStrategy: &buildapi.CustomBuildStrategy{}}),

 			kind:             "BuildConfig",

 			resource:         buildConfigsResource,

 			reviewResponse:   reviewResponse(false, ""),

@@ -110,7 +110,7 @@ func TestBuildAdmission(t *testing.T) {

 		},

 		{

 			name:             "forbidden build config instantiate",

-			responseObject:   testBuildConfig(buildapi.CustomBuildStrategyType),

+			responseObject:   testBuildConfig(buildapi.BuildStrategy{CustomStrategy: &buildapi.CustomBuildStrategy{}}),

 			object:           testBuildRequest("buildname"),

 			kind:             "BuildConfig",

 			resource:         buildConfigsResource,

@@ -182,29 +182,25 @@ func fakeClient(expectedResource string, reviewResponse *authorizationapi.Subjec

 	return fake

 }

-func testBuild(strategy buildapi.BuildStrategyType) *buildapi.Build {

+func testBuild(strategy buildapi.BuildStrategy) *buildapi.Build {

 	return &buildapi.Build{

 		ObjectMeta: kapi.ObjectMeta{

 			Name: "test-build",

 		},

 		Spec: buildapi.BuildSpec{

-			Strategy: buildapi.BuildStrategy{

-				Type: strategy,

-			},

+			Strategy: strategy,

 		},

 	}

 }

-func testBuildConfig(strategy buildapi.BuildStrategyType) *buildapi.BuildConfig {

+func testBuildConfig(strategy buildapi.BuildStrategy) *buildapi.BuildConfig {

 	return &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

 			Name: "test-buildconfig",

 		},

 		Spec: buildapi.BuildConfigSpec{

 			BuildSpec: buildapi.BuildSpec{

-				Strategy: buildapi.BuildStrategy{

-					Type: strategy,

-				},

+				Strategy: strategy,

 			},

 		},

 	}

@@ -166,24 +166,8 @@ const (

 	StatusReasonExceededRetryTimeout = "ExceededRetryTimeout"

 )

-// BuildSourceType is the type of SCM used.

-type BuildSourceType string

-

-// Valid values for BuildSourceType.

-const (

-	//BuildSourceGit instructs a build to use a Git source control repository as the build input.

-	BuildSourceGit BuildSourceType = "Git"

-	// BuildSourceDockerfile uses a Dockerfile as the start of a build

-	BuildSourceDockerfile BuildSourceType = "Dockerfile"

-	// BuildSourceBinary indicates the build will accept a Binary file as input.

-	BuildSourceBinary BuildSourceType = "Binary"

-)

-

 // BuildSource is the input used for the build.

 type BuildSource struct {

-	// Type of build input to accept

-	Type BuildSourceType

-

 	// Binary builds accept a binary as their input. The binary is generally assumed to be a tar,

 	// gzipped tar, or zip file depending on the strategy. For Docker builds, this is the build

 	// context and an optional Dockerfile may be specified to override any Dockerfile in the

@@ -229,9 +213,6 @@ type BinaryBuildSource struct {

 // SourceRevision is the revision or commit information from the source for the build

 type SourceRevision struct {

-	// Type of the build source

-	Type BuildSourceType

-

 	// Git contains information about git-based build source

 	Git *GitSourceRevision

 }

@@ -278,9 +259,6 @@ type SourceControlUser struct {

 // BuildStrategy contains the details of how to perform a build.

 type BuildStrategy struct {

-	// Type is the kind of build strategy.

-	Type BuildStrategyType

-

 	// DockerStrategy holds the parameters to the Docker build strategy.

 	DockerStrategy *DockerBuildStrategy

@@ -294,19 +272,6 @@ type BuildStrategy struct {

 // BuildStrategyType describes a particular way of performing a build.

 type BuildStrategyType string

-// Valid values for BuildStrategyType.

-const (

-	// DockerBuildStrategyType performs builds using a Dockerfile.

-	DockerBuildStrategyType BuildStrategyType = "Docker"

-

-	// SourceBuildStrategyType performs builds build using Source To Images with a Git repository

-	// and a builder image.

-	SourceBuildStrategyType BuildStrategyType = "Source"

-

-	// CustomBuildStrategyType performs builds using custom builder Docker image.

-	CustomBuildStrategyType BuildStrategyType = "Custom"

-)

-

 const (

 	// CustomBuildStrategyBaseImageKey is the environment variable that indicates the base image to be used when

 	// performing a custom build, if needed.

@@ -526,10 +491,7 @@ type BuildConfigList struct {

 // GenericWebHookEvent is the payload expected for a generic webhook post

 type GenericWebHookEvent struct {

-	// Type is the type of source repository

-	Type BuildSourceType

-

-	// Git is the git information if the Type is BuildSourceGit

+	// Git is the git information, if any.

 	Git *GitInfo

 }

@@ -11,3 +11,35 @@ const (

 func GetBuildPodName(build *Build) string {

 	return namer.GetPodName(build.Name, BuildPodSuffix)

 }

+

+func StrategyType(strategy BuildStrategy) string {

+	switch {

+	case strategy.DockerStrategy != nil:

+		return "Docker"

+	case strategy.CustomStrategy != nil:

+		return "Custom"

+	case strategy.SourceStrategy != nil:

+		return "Source"

+	}

+	return ""

+}

+

+func SourceType(source BuildSource) string {

+	var sourceType string

+	if source.Git != nil {

+		sourceType = "Git"

+	}

+	if source.Dockerfile != nil {

+		if len(sourceType) != 0 {

+			sourceType = sourceType + ","

+		}

+		sourceType = sourceType + "Dockerfile"

+	}

+	if source.Binary != nil {

+		if len(sourceType) != 0 {

+			sourceType = sourceType + ","

+		}

+		sourceType = sourceType + "Binary"

+	}

+	return sourceType

+}

@@ -113,6 +113,69 @@ func convert_v1_BuildTriggerPolicy_To_api_BuildTriggerPolicy(in *BuildTriggerPol

 	return nil

 }

+func convert_api_SourceRevision_To_v1_SourceRevision(in *newer.SourceRevision, out *SourceRevision, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	out.Type = BuildSourceGit

+	return nil

+}

+

+func convert_v1_SourceRevision_To_api_SourceRevision(in *SourceRevision, out *newer.SourceRevision, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	return nil

+}

+

+func convert_api_BuildSource_To_v1_BuildSource(in *newer.BuildSource, out *BuildSource, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	switch {

+	// it is legal for a buildsource to have both a git+dockerfile source, but in v1 that was represented

+	// as type git.

+	case in.Git != nil:

+		out.Type = BuildSourceGit

+	// it is legal for a buildsource to have both a binary+dockerfile source, but in v1 that was represented

+	// as type binary.

+	case in.Binary != nil:

+		out.Type = BuildSourceBinary

+	case in.Dockerfile != nil:

+		out.Type = BuildSourceDockerfile

+	}

+	return nil

+}

+

+func convert_v1_BuildSource_To_api_BuildSource(in *BuildSource, out *newer.BuildSource, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	return nil

+}

+

+func convert_api_BuildStrategy_To_v1_BuildStrategy(in *newer.BuildStrategy, out *BuildStrategy, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	switch {

+	case in.SourceStrategy != nil:

+		out.Type = SourceBuildStrategyType

+	case in.DockerStrategy != nil:

+		out.Type = DockerBuildStrategyType

+	case in.CustomStrategy != nil:

+		out.Type = CustomBuildStrategyType

+	}

+	return nil

+}

+

+func convert_v1_BuildStrategy_To_api_BuildStrategy(in *BuildStrategy, out *newer.BuildStrategy, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	return nil

+}

+

 func init() {

 	err := kapi.Scheme.AddDefaultingFuncs(

 		func(strategy *BuildStrategy) {

@@ -159,6 +222,12 @@ func init() {

 		convert_api_BuildOutput_To_v1_BuildOutput,

 		convert_v1_BuildTriggerPolicy_To_api_BuildTriggerPolicy,

 		convert_api_BuildTriggerPolicy_To_v1_BuildTriggerPolicy,

+		convert_v1_SourceRevision_To_api_SourceRevision,

+		convert_api_SourceRevision_To_v1_SourceRevision,

+		convert_v1_BuildSource_To_api_BuildSource,

+		convert_api_BuildSource_To_v1_BuildSource,

+		convert_v1_BuildStrategy_To_api_BuildStrategy,

+		convert_api_BuildStrategy_To_v1_BuildStrategy,

 	)

 	if err := kapi.Scheme.AddFieldLabelConversionFunc("v1", "Build",

@@ -121,6 +121,68 @@ func convert_api_BuildTriggerPolicy_To_v1beta3_BuildTriggerPolicy(in *newer.Buil

 	return nil

 }

+func convert_v1beta3_SourceRevision_To_api_SourceRevision(in *SourceRevision, out *newer.SourceRevision, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	return nil

+}

+

+func convert_api_SourceRevision_To_v1beta3_SourceRevision(in *newer.SourceRevision, out *SourceRevision, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	out.Type = BuildSourceGit

+	return nil

+}

+

+func convert_v1beta3_BuildSource_To_api_BuildSource(in *BuildSource, out *newer.BuildSource, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	return nil

+}

+

+func convert_api_BuildSource_To_v1beta3_BuildSource(in *newer.BuildSource, out *BuildSource, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	switch {

+	// it is legal for a buildsource to have both a git+dockerfile source, but in v1 that was represented

+	// as type git.

+	case in.Git != nil:

+		out.Type = BuildSourceGit

+	// it is legal for a buildsource to have both a binary+dockerfile source, but in v1 that was represented

+	// as type binary.

+	case in.Binary != nil:

+		out.Type = BuildSourceBinary

+	case in.Dockerfile != nil:

+		out.Type = BuildSourceDockerfile

+	}

+	return nil

+}

+

+func convert_v1beta3_BuildStrategy_To_api_BuildStrategy(in *BuildStrategy, out *newer.BuildStrategy, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	return nil

+}

+

+func convert_api_BuildStrategy_To_v1beta3_BuildStrategy(in *newer.BuildStrategy, out *BuildStrategy, s conversion.Scope) error {

+	if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+		return err

+	}

+	switch {

+	case in.SourceStrategy != nil:

+		out.Type = SourceBuildStrategyType

+	case in.DockerStrategy != nil:

+		out.Type = DockerBuildStrategyType

+	case in.CustomStrategy != nil:

+		out.Type = CustomBuildStrategyType

+	}

+	return nil

+}

 func init() {

 	err := kapi.Scheme.AddDefaultingFuncs(

 		func(strategy *BuildStrategy) {

@@ -167,6 +229,12 @@ func init() {

 		convert_api_BuildOutput_To_v1beta3_BuildOutput,

 		convert_v1beta3_BuildTriggerPolicy_To_api_BuildTriggerPolicy,

 		convert_api_BuildTriggerPolicy_To_v1beta3_BuildTriggerPolicy,

+		convert_v1beta3_SourceRevision_To_api_SourceRevision,

+		convert_api_SourceRevision_To_v1beta3_SourceRevision,

+		convert_v1beta3_BuildSource_To_api_BuildSource,

+		convert_api_BuildSource_To_v1beta3_BuildSource,

+		convert_v1beta3_BuildStrategy_To_api_BuildStrategy,

+		convert_api_BuildStrategy_To_v1beta3_BuildStrategy,

 	)

 	// Add field conversion funcs.