@@ -1003,10 +1003,6 @@ func autoConvert_api_BuildConfig_To_v1_BuildConfig(in *buildapi.BuildConfig, out

 	return nil

 }

-func Convert_api_BuildConfig_To_v1_BuildConfig(in *buildapi.BuildConfig, out *v1.BuildConfig, s conversion.Scope) error {

-	return autoConvert_api_BuildConfig_To_v1_BuildConfig(in, out, s)

-}

-

 func autoConvert_api_BuildConfigList_To_v1_BuildConfigList(in *buildapi.BuildConfigList, out *v1.BuildConfigList, s conversion.Scope) error {

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

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

@@ -1017,7 +1013,7 @@ func autoConvert_api_BuildConfigList_To_v1_BuildConfigList(in *buildapi.BuildCon

 	if in.Items != nil {

 		out.Items = make([]v1.BuildConfig, len(in.Items))

 		for i := range in.Items {

-			if err := Convert_api_BuildConfig_To_v1_BuildConfig(&in.Items[i], &out.Items[i], s); err != nil {

+			if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil {

 				return err

 			}

 		}

@@ -1813,10 +1809,6 @@ func autoConvert_v1_BuildConfig_To_api_BuildConfig(in *v1.BuildConfig, out *buil

 	return nil

 }

-func Convert_v1_BuildConfig_To_api_BuildConfig(in *v1.BuildConfig, out *buildapi.BuildConfig, s conversion.Scope) error {

-	return autoConvert_v1_BuildConfig_To_api_BuildConfig(in, out, s)

-}

-

 func autoConvert_v1_BuildConfigList_To_api_BuildConfigList(in *v1.BuildConfigList, out *buildapi.BuildConfigList, s conversion.Scope) error {

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

 		defaulting.(func(*v1.BuildConfigList))(in)

@@ -1827,7 +1819,7 @@ func autoConvert_v1_BuildConfigList_To_api_BuildConfigList(in *v1.BuildConfigLis

 	if in.Items != nil {

 		out.Items = make([]buildapi.BuildConfig, len(in.Items))

 		for i := range in.Items {

-			if err := Convert_v1_BuildConfig_To_api_BuildConfig(&in.Items[i], &out.Items[i], s); err != nil {

+			if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil {

 				return err

 			}

 		}

@@ -1011,10 +1011,6 @@ func autoConvert_api_BuildConfig_To_v1beta3_BuildConfig(in *buildapi.BuildConfig

 	return nil

 }

-func Convert_api_BuildConfig_To_v1beta3_BuildConfig(in *buildapi.BuildConfig, out *v1beta3.BuildConfig, s conversion.Scope) error {

-	return autoConvert_api_BuildConfig_To_v1beta3_BuildConfig(in, out, s)

-}

-

 func autoConvert_api_BuildConfigList_To_v1beta3_BuildConfigList(in *buildapi.BuildConfigList, out *v1beta3.BuildConfigList, s conversion.Scope) error {

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

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

@@ -1025,7 +1021,7 @@ func autoConvert_api_BuildConfigList_To_v1beta3_BuildConfigList(in *buildapi.Bui

 	if in.Items != nil {

 		out.Items = make([]v1beta3.BuildConfig, len(in.Items))

 		for i := range in.Items {

-			if err := Convert_api_BuildConfig_To_v1beta3_BuildConfig(&in.Items[i], &out.Items[i], s); err != nil {

+			if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil {

 				return err

 			}

 		}

@@ -1756,10 +1752,6 @@ func autoConvert_v1beta3_BuildConfig_To_api_BuildConfig(in *v1beta3.BuildConfig,

 	return nil

 }

-func Convert_v1beta3_BuildConfig_To_api_BuildConfig(in *v1beta3.BuildConfig, out *buildapi.BuildConfig, s conversion.Scope) error {

-	return autoConvert_v1beta3_BuildConfig_To_api_BuildConfig(in, out, s)

-}

-

 func autoConvert_v1beta3_BuildConfigList_To_api_BuildConfigList(in *v1beta3.BuildConfigList, out *buildapi.BuildConfigList, s conversion.Scope) error {

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

 		defaulting.(func(*v1beta3.BuildConfigList))(in)

@@ -1770,7 +1762,7 @@ func autoConvert_v1beta3_BuildConfigList_To_api_BuildConfigList(in *v1beta3.Buil

 	if in.Items != nil {

 		out.Items = make([]buildapi.BuildConfig, len(in.Items))

 		for i := range in.Items {

-			if err := Convert_v1beta3_BuildConfig_To_api_BuildConfig(&in.Items[i], &out.Items[i], s); err != nil {

+			if err := s.Convert(&in.Items[i], &out.Items[i], 0); err != nil {

 				return err

 			}

 		}

@@ -6,9 +6,43 @@ import (

 	oapi "github.com/openshift/origin/pkg/api"

 	newer "github.com/openshift/origin/pkg/build/api"

+	buildutil "github.com/openshift/origin/pkg/build/util"

 	imageapi "github.com/openshift/origin/pkg/image/api"

 )

+func convert_v1_BuildConfig_To_api_BuildConfig(in *BuildConfig, out *newer.BuildConfig, s conversion.Scope) error {

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

+		return err

+	}

+

+	newTriggers := []newer.BuildTriggerPolicy{}

+	// strip off any default imagechange triggers where the buildconfig's

+	// "from" is not an ImageStreamTag, because those triggers

+	// will never be invoked.

+	imageRef := buildutil.GetImageStreamForStrategy(out.Spec.Strategy)

+	hasIST := imageRef != nil && imageRef.Kind == "ImageStreamTag"

+	for _, trigger := range out.Spec.Triggers {

+		if trigger.Type != newer.ImageChangeBuildTriggerType {

+			newTriggers = append(newTriggers, trigger)

+			continue

+		}

+		if (trigger.ImageChange == nil || trigger.ImageChange.From == nil) && !hasIST {

+			continue

+		}

+		newTriggers = append(newTriggers, trigger)

+	}

+	out.Spec.Triggers = newTriggers

+	return nil

+}

+

+// empty conversion needed because the conversion generator can't handle unidirectional custom conversions

+func convert_api_BuildConfig_To_v1_BuildConfig(in *newer.BuildConfig, out *BuildConfig, s conversion.Scope) error {

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

+		return err

+	}

+	return nil

+}

+

 func convert_v1_SourceBuildStrategy_To_api_SourceBuildStrategy(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {

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

 		return err

@@ -212,6 +246,8 @@ func addConversionFuncs(scheme *runtime.Scheme) {

 	}

 	scheme.AddConversionFuncs(

+		convert_v1_BuildConfig_To_api_BuildConfig,

+		convert_api_BuildConfig_To_v1_BuildConfig,

 		convert_v1_SourceBuildStrategy_To_api_SourceBuildStrategy,

 		convert_api_SourceBuildStrategy_To_v1_SourceBuildStrategy,

 		convert_v1_DockerBuildStrategy_To_api_DockerBuildStrategy,

@@ -223,3 +223,48 @@ func TestBuildConfigConversion(t *testing.T) {

 		}

 	}

 }

+

+func TestInvalidImageChangeTriggerRemoval(t *testing.T) {

+	buildConfig := older.BuildConfig{

+		ObjectMeta: kolder.ObjectMeta{Name: "config-id", Namespace: "namespace"},

+		Spec: older.BuildConfigSpec{

+			BuildSpec: older.BuildSpec{

+				Strategy: older.BuildStrategy{

+					Type: older.DockerBuildStrategyType,

+					DockerStrategy: &older.DockerBuildStrategy{

+						From: &kolder.ObjectReference{

+							Kind: "DockerImage",

+							Name: "fromimage",

+						},

+					},

+				},

+			},

+			Triggers: []older.BuildTriggerPolicy{

+				{

+					Type:        older.ImageChangeBuildTriggerType,

+					ImageChange: &older.ImageChangeTrigger{},

+				},

+				{

+					Type: older.ImageChangeBuildTriggerType,

+					ImageChange: &older.ImageChangeTrigger{

+						From: &kolder.ObjectReference{

+							Kind: "ImageStreamTag",

+							Name: "imagestream",

+						},

+					},

+				},

+			},

+		},

+	}

+

+	var internalBC newer.BuildConfig

+

+	Convert(&buildConfig, &internalBC)

+	if len(internalBC.Spec.Triggers) != 1 {

+		t.Errorf("Expected 1 trigger, got %d", len(internalBC.Spec.Triggers))

+	}

+	if internalBC.Spec.Triggers[0].ImageChange.From == nil {

+		t.Errorf("Expected remaining trigger to have a From value")

+	}

+

+}

@@ -7,9 +7,43 @@ import (

 	"k8s.io/kubernetes/pkg/runtime"

 	newer "github.com/openshift/origin/pkg/build/api"

+	buildutil "github.com/openshift/origin/pkg/build/util"

 	imageapi "github.com/openshift/origin/pkg/image/api"

 )

+func convert_v1beta3_BuildConfig_To_api_BuildConfig(in *BuildConfig, out *newer.BuildConfig, s conversion.Scope) error {

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

+		return err

+	}

+

+	newTriggers := []newer.BuildTriggerPolicy{}

+	// strip off any default imagechange triggers where the buildconfig's

+	// "from" is not an ImageStreamTag, because those triggers

+	// will never be invoked.

+	imageRef := buildutil.GetImageStreamForStrategy(out.Spec.Strategy)

+	hasIST := imageRef != nil && imageRef.Kind == "ImageStreamTag"

+	for _, trigger := range out.Spec.Triggers {

+		if trigger.Type != newer.ImageChangeBuildTriggerType {

+			newTriggers = append(newTriggers, trigger)

+			continue

+		}

+		if (trigger.ImageChange == nil || trigger.ImageChange.From == nil) && !hasIST {

+			continue

+		}

+		newTriggers = append(newTriggers, trigger)

+	}

+	out.Spec.Triggers = newTriggers

+	return nil

+}

+

+// empty conversion needed because the conversion generator can't handle unidirectional custom conversions

+func convert_api_BuildConfig_To_v1beta3_BuildConfig(in *newer.BuildConfig, out *BuildConfig, s conversion.Scope) error {

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

+		return err

+	}

+	return nil

+}

+

 func convert_v1beta3_SourceBuildStrategy_To_api_SourceBuildStrategy(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {

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

 		return err

@@ -220,6 +254,8 @@ func addConversionFuncs(scheme *runtime.Scheme) {

 	}

 	scheme.AddConversionFuncs(

+		convert_v1beta3_BuildConfig_To_api_BuildConfig,

+		convert_api_BuildConfig_To_v1beta3_BuildConfig,

 		convert_v1beta3_SourceBuildStrategy_To_api_SourceBuildStrategy,

 		convert_api_SourceBuildStrategy_To_v1beta3_SourceBuildStrategy,

 		convert_v1beta3_DockerBuildStrategy_To_api_DockerBuildStrategy,

@@ -44,7 +44,8 @@ func TestBuildConfigConversion(t *testing.T) {

 				},

 				Triggers: []older.BuildTriggerPolicy{

 					{

-						Type: older.ImageChangeBuildTriggerType,

+						Type:        older.ImageChangeBuildTriggerType,

+						ImageChange: &older.ImageChangeTrigger{},

 					},

 					{

 						Type: older.GitHubWebHookBuildTriggerType,

@@ -84,7 +85,8 @@ func TestBuildConfigConversion(t *testing.T) {

 				},

 				Triggers: []older.BuildTriggerPolicy{

 					{

-						Type: older.ImageChangeBuildTriggerType,

+						Type:        older.ImageChangeBuildTriggerType,

+						ImageChange: &older.ImageChangeTrigger{},

 					},

 					{

 						Type: older.GitHubWebHookBuildTriggerType,

@@ -124,7 +126,8 @@ func TestBuildConfigConversion(t *testing.T) {

 				},

 				Triggers: []older.BuildTriggerPolicy{

 					{

-						Type: older.ImageChangeBuildTriggerType,

+						Type:        older.ImageChangeBuildTriggerType,

+						ImageChange: &older.ImageChangeTrigger{},

 					},

 					{

 						Type: older.GitHubWebHookBuildTriggerType,

@@ -261,3 +264,48 @@ func TestBuildTriggerPolicyNewToOldConversion(t *testing.T) {

 		}

 	}

 }

+

+func TestInvalidImageChangeTriggerRemoval(t *testing.T) {

+	buildConfig := older.BuildConfig{

+		ObjectMeta: kolder.ObjectMeta{Name: "config-id", Namespace: "namespace"},

+		Spec: older.BuildConfigSpec{

+			BuildSpec: older.BuildSpec{

+				Strategy: older.BuildStrategy{

+					Type: older.DockerBuildStrategyType,

+					DockerStrategy: &older.DockerBuildStrategy{

+						From: &kolder.ObjectReference{

+							Kind: "DockerImage",

+							Name: "fromimage",

+						},

+					},

+				},

+			},

+			Triggers: []older.BuildTriggerPolicy{

+				{

+					Type:        older.ImageChangeBuildTriggerType,

+					ImageChange: &older.ImageChangeTrigger{},

+				},

+				{

+					Type: older.ImageChangeBuildTriggerType,

+					ImageChange: &older.ImageChangeTrigger{

+						From: &kolder.ObjectReference{

+							Kind: "ImageStreamTag",

+							Name: "imagestream",

+						},

+					},

+				},

+			},

+		},

+	}

+

+	var internalBC newer.BuildConfig

+

+	Convert(&buildConfig, &internalBC)

+	if len(internalBC.Spec.Triggers) != 1 {

+		t.Errorf("Expected 1 trigger, got %d", len(internalBC.Spec.Triggers))

+	}

+	if internalBC.Spec.Triggers[0].ImageChange.From == nil {

+		t.Errorf("Expected remaining trigger to have a From value")

+	}

+

+}

@@ -64,14 +64,15 @@ func ValidateBuildConfig(config *buildapi.BuildConfig) field.ErrorList {

 	fromRefs := map[string]struct{}{}

 	specPath := field.NewPath("spec")

 	triggersPath := specPath.Child("triggers")

+	buildFrom := buildutil.GetImageStreamForStrategy(config.Spec.Strategy)

 	for i, trg := range config.Spec.Triggers {

-		allErrs = append(allErrs, validateTrigger(&trg, triggersPath.Index(i))...)

+		allErrs = append(allErrs, validateTrigger(&trg, buildFrom, triggersPath.Index(i))...)

 		if trg.Type != buildapi.ImageChangeBuildTriggerType || trg.ImageChange == nil {

 			continue

 		}

 		from := trg.ImageChange.From

 		if from == nil {

-			from = buildutil.GetImageStreamForStrategy(config.Spec.Strategy)

+			from = buildFrom

 		}

 		fromKey := refKey(config.Namespace, from)

 		_, exists := fromRefs[fromKey]

@@ -83,16 +84,6 @@ func ValidateBuildConfig(config *buildapi.BuildConfig) field.ErrorList {

 	allErrs = append(allErrs, validateBuildSpec(&config.Spec.BuildSpec, specPath)...)

-	// validate ImageChangeTriggers of DockerStrategy builds

-	strategy := config.Spec.BuildSpec.Strategy

-	if strategy.DockerStrategy != nil && strategy.DockerStrategy.From == nil {

-		for i, trigger := range config.Spec.Triggers {

-			if trigger.Type == buildapi.ImageChangeBuildTriggerType && (trigger.ImageChange == nil || trigger.ImageChange.From == nil) {

-				allErrs = append(allErrs, field.Required(triggersPath.Index(i).Child("imageChange", "from"), ""))

-			}

-		}

-	}

-

 	return allErrs

 }

@@ -453,7 +444,7 @@ func validateCustomStrategy(strategy *buildapi.CustomBuildStrategy, fldPath *fie

 	return allErrs

 }

-func validateTrigger(trigger *buildapi.BuildTriggerPolicy, fldPath *field.Path) field.ErrorList {

+func validateTrigger(trigger *buildapi.BuildTriggerPolicy, buildFrom *kapi.ObjectReference, fldPath *field.Path) field.ErrorList {

 	allErrs := field.ErrorList{}

 	if len(trigger.Type) == 0 {

 		allErrs = append(allErrs, field.Required(fldPath.Child("type"), ""))

@@ -480,6 +471,15 @@ func validateTrigger(trigger *buildapi.BuildTriggerPolicy, fldPath *field.Path)

 			break

 		}

 		if trigger.ImageChange.From == nil {

+			if buildFrom == nil || buildFrom.Kind != "ImageStreamTag" {

+				invalidKindErr := field.Invalid(

+					fldPath.Child("imageChange"),

+					fmt.Sprintf("build from: %v", buildFrom),

+					"a default ImageChange trigger can only be used when the build strategy includes an ImageStreamTag reference.")

+				allErrs = append(allErrs, invalidKindErr)

+				break

+			}

+

 			break

 		}

 		if kind := trigger.ImageChange.From.Kind; kind != "ImageStreamTag" {

@@ -282,8 +282,8 @@ func TestBuildConfigDockerStrategyImageChangeTrigger(t *testing.T) {

 		t.Errorf("Expected validation error, got nothing")

 	case 1:

 		err := errors[0]

-		if err.Type != field.ErrorTypeRequired {

-			t.Errorf("Expected error to be '%v', got '%v'", field.ErrorTypeRequired, err.Type)

+		if err.Type != field.ErrorTypeInvalid {

+			t.Errorf("Expected error to be '%v', got '%v'", field.ErrorTypeInvalid, err.Type)

 		}

 	default:

 		t.Errorf("Expected a single validation error, got %v", errors)

@@ -330,20 +330,46 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 	tests := []struct {

 		name        string

 		triggers    []buildapi.BuildTriggerPolicy

+		fromKind    string

 		expectError bool

 		errorType   field.ErrorType

 	}{

 		{

-			name: "valid default trigger",

+			name: "valid default trigger with imagestreamtag",

 			triggers: []buildapi.BuildTriggerPolicy{

 				{

 					Type:        buildapi.ImageChangeBuildTriggerType,

 					ImageChange: &buildapi.ImageChangeTrigger{},

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: false,

 		},

 		{

+			name: "invalid default trigger (imagestreamimage)",

+			triggers: []buildapi.BuildTriggerPolicy{

+				{

+					Type:        buildapi.ImageChangeBuildTriggerType,

+					ImageChange: &buildapi.ImageChangeTrigger{},

+				},

+			},

+			fromKind:    "ImageStreamImage",

+			expectError: true,

+			errorType:   field.ErrorTypeInvalid,

+		},

+		{

+			name: "invalid default trigger (dockerimage)",

+			triggers: []buildapi.BuildTriggerPolicy{

+				{

+					Type:        buildapi.ImageChangeBuildTriggerType,

+					ImageChange: &buildapi.ImageChangeTrigger{},

+				},

+			},

+			fromKind:    "DockerImage",

+			expectError: true,

+			errorType:   field.ErrorTypeInvalid,

+		},

+		{

 			name: "more than one default trigger",

 			triggers: []buildapi.BuildTriggerPolicy{

 				{

@@ -355,6 +381,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					ImageChange: &buildapi.ImageChangeTrigger{},

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: true,

 			errorType:   field.ErrorTypeInvalid,

 		},

@@ -365,6 +392,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					Type: buildapi.ImageChangeBuildTriggerType,

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: true,

 			errorType:   field.ErrorTypeRequired,

 		},

@@ -385,6 +413,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					},

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: false,

 		},

 		{

@@ -404,6 +433,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					},

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: true,

 			errorType:   field.ErrorTypeInvalid,

 		},

@@ -423,6 +453,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					},

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: true,

 			errorType:   field.ErrorTypeInvalid,

 		},

@@ -448,6 +479,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					},

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: true,

 			errorType:   field.ErrorTypeInvalid,

 		},

@@ -468,6 +500,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					},

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: true,

 			errorType:   field.ErrorTypeInvalid,

 		},

@@ -495,6 +528,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					},

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: false,

 		},

 		{

@@ -521,6 +555,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					},

 				},

 			},

+			fromKind:    "ImageStreamTag",

 			expectError: true,

 			errorType:   field.ErrorTypeInvalid,

 		},

@@ -540,7 +575,7 @@ func TestBuildConfigImageChangeTriggers(t *testing.T) {

 					Strategy: buildapi.BuildStrategy{

 						SourceStrategy: &buildapi.SourceBuildStrategy{

 							From: kapi.ObjectReference{

-								Kind: "ImageStreamTag",

+								Kind: tc.fromKind,

 								Name: "builderimage:latest",

 							},

 						},

@@ -1685,7 +1720,7 @@ func TestValidateTrigger(t *testing.T) {

 		},

 	}

 	for desc, test := range tests {

-		errors := validateTrigger(&test.trigger, nil)

+		errors := validateTrigger(&test.trigger, &kapi.ObjectReference{Kind: "ImageStreamTag"}, nil)

 		if len(test.expected) == 0 {

 			if len(errors) != 0 {

 				t.Errorf("%s: Got unexpected validation errors: %#v", desc, errors)