@@ -160,6 +160,12 @@ func OkPodTemplate() *kapi.PodTemplateSpec {

 	}

 }

+func OkPodTemplateChanged() *kapi.PodTemplateSpec {

+	template := OkPodTemplate()

+	template.Spec.Containers[0].Image = DockerImageReference

+	return template

+}

+

 func OkPodTemplateMissingImage(missing ...string) *kapi.PodTemplateSpec {

 	set := sets.NewString(missing...)

 	template := OkPodTemplate()

@@ -194,19 +200,22 @@ func OkImageChangeTrigger() deployapi.DeploymentTriggerPolicy {

 	}

 }

+func OkTriggeredImageChange() deployapi.DeploymentTriggerPolicy {

+	ict := OkImageChangeTrigger()

+	ict.ImageChangeParams.LastTriggeredImage = DockerImageReference

+	return ict

+}

+

 func OkNonAutomaticICT() deployapi.DeploymentTriggerPolicy {

-	return deployapi.DeploymentTriggerPolicy{

-		Type: deployapi.DeploymentTriggerOnImageChange,

-		ImageChangeParams: &deployapi.DeploymentTriggerImageChangeParams{

-			ContainerNames: []string{

-				"container1",

-			},

-			From: kapi.ObjectReference{

-				Kind: "ImageStreamTag",

-				Name: imageapi.JoinImageStreamTag(ImageStreamName, imageapi.DefaultImageTag),

-			},

-		},

-	}

+	ict := OkImageChangeTrigger()

+	ict.ImageChangeParams.Automatic = false

+	return ict

+}

+

+func OkTriggeredNonAutomatic() deployapi.DeploymentTriggerPolicy {

+	ict := OkNonAutomaticICT()

+	ict.ImageChangeParams.LastTriggeredImage = DockerImageReference

+	return ict

 }

 func TestDeploymentConfig(config *deployapi.DeploymentConfig) *deployapi.DeploymentConfig {

@@ -3,27 +3,33 @@ package generictrigger

 import (

 	"fmt"

-	"github.com/golang/glog"

-

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

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

+	"k8s.io/kubernetes/pkg/runtime"

 	osclient "github.com/openshift/origin/pkg/client"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

-// DeploymentTriggerController increments the version of a

-// DeploymentConfig which has a config change trigger when a pod template

-// change is detected.

-//

-// Use the DeploymentTriggerControllerFactory to create this controller.

+// DeploymentTriggerController processes all triggers for a deployment config

+// and kicks new deployments whenever possible.

 type DeploymentTriggerController struct {

-	client  osclient.Interface

-	kClient kclient.Interface

+	// dn is used to update deployment configs.

+	dn osclient.DeploymentConfigsNamespacer

+	// rn is used for getting the latest deployment for a config.

+	rn kclient.ReplicationControllersNamespacer

+	// codec is used for decoding a config out of a deployment.

+	codec runtime.Codec

+}

-	// decodeConfig knows how to decode the deploymentConfig from a deployment's annotations.

-	decodeConfig func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error)

+// NewDeploymentTriggerController returns a new DeploymentTriggerController.

+func NewDeploymentTriggerController(oc osclient.Interface, kc kclient.Interface, codec runtime.Codec) *DeploymentTriggerController {

+	return &DeploymentTriggerController{

+		dn:    oc,

+		rn:    kc,

+		codec: codec,

+	}

 }

 // fatalError is an error which can't be retried.

@@ -33,9 +39,9 @@ func (e fatalError) Error() string {

 	return fmt.Sprintf("fatal error handling configuration: %s", string(e))

 }

-// Handle processes change triggers for config.

+// Handle processes deployment triggers for a deployment config.

 func (c *DeploymentTriggerController) Handle(config *deployapi.DeploymentConfig) error {

-	if !deployutil.HasChangeTrigger(config) || config.Spec.Paused {

+	if len(config.Spec.Triggers) == 0 || config.Spec.Paused {

 		return nil

 	}

@@ -46,26 +52,14 @@ func (c *DeploymentTriggerController) Handle(config *deployapi.DeploymentConfig)

 		return err

 	}

-	// If this is the initial deployment, then wait for any images that need to be resolved, otherwise

-	// automatically start a new deployment.

-	if config.Status.LatestVersion == 0 {

-		canTrigger, causes := canTrigger(config, decoded)

-		if !canTrigger {

-			// If we cannot trigger then we need to wait for the image change controller.

-			glog.V(5).Infof("Ignoring deployment config %q; template image needs to be resolved by the image change controller", deployutil.LabelForDeploymentConfig(config))

-			return nil

-		}

-		return c.updateStatus(config, causes)

-	}

+	canTrigger, causes := canTrigger(config, decoded)

-	// If this is not the initial deployment, check if there is any template difference between

-	// this and the decoded deploymentconfig.

-	if kapi.Semantic.DeepEqual(config.Spec.Template, decoded.Spec.Template) {

+	// Return if we cannot trigger a new deployment.

+	if !canTrigger {

 		return nil

 	}

-	_, causes := canTrigger(config, decoded)

-	return c.updateStatus(config, causes)

+	return c.update(config, causes)

 }

 // decodeFromLatest will try to return the decoded version of the current deploymentconfig found

@@ -77,7 +71,7 @@ func (c *DeploymentTriggerController) decodeFromLatest(config *deployapi.Deploym

 	}

 	latestDeploymentName := deployutil.LatestDeploymentNameForConfig(config)

-	deployment, err := c.kClient.ReplicationControllers(config.Namespace).Get(latestDeploymentName)

+	deployment, err := c.rn.ReplicationControllers(config.Namespace).Get(latestDeploymentName)

 	if err != nil {

 		// If there's no deployment for the latest config, we have no basis of

 		// comparison. It's the responsibility of the deployment config controller

@@ -85,18 +79,35 @@ func (c *DeploymentTriggerController) decodeFromLatest(config *deployapi.Deploym

 		return nil, fmt.Errorf("couldn't retrieve deployment for deployment config %q: %v", deployutil.LabelForDeploymentConfig(config), err)

 	}

-	return c.decodeConfig(deployment)

+	latest, err := deployutil.DecodeDeploymentConfig(deployment, c.codec)

+	if err != nil {

+		return nil, fatalError(err.Error())

+	}

+	return latest, nil

 }

-// canTrigger is used by the config change controller to determine if the provided config can

-// trigger its initial deployment. The only requirement is set for image change trigger (ICT)

-// deployments - all of the ICTs need to have LastTriggedImage set which means that the image

-// change controller did its job. The second return argument helps in separating between config

-// change and image change causes.

+// canTrigger is used by the trigger controller to determine if the provided config can trigger

+// a deployment.

+//

+// Image change triggers are processed first. It is required for all of them to point to images

+// that exist. Otherwise, this controller will wait for the images to land and be updated in the

+// triggers that point to them by the image change controller.

+//

+// Config change triggers are processed last. If all images are resolved and an automatic trigger

+// was updated, then it should be possible to trigger a new deployment without a config change

+// trigger. Otherwise, if a config change trigger exists and the config is not deployed yet or it

+// has a podtemplate change, then the controller should trigger a new deployment (assuming all

+// image change triggers can trigger).

 func canTrigger(config, decoded *deployapi.DeploymentConfig) (bool, []deployapi.DeploymentCause) {

-	ictCount, resolved := 0, 0

+	if decoded == nil {

+		// The decoded deployment config will never be nil here but a sanity check

+		// never hurts.

+		return false, nil

+	}

+	ictCount, resolved, canTriggerByImageChange := 0, 0, false

 	var causes []deployapi.DeploymentCause

+	// IMAGE CHANGE TRIGGERS

 	for _, t := range config.Spec.Triggers {

 		if t.Type != deployapi.DeploymentTriggerOnImageChange {

 			continue

@@ -111,6 +122,11 @@ func canTrigger(config, decoded *deployapi.DeploymentConfig) (bool, []deployapi.

 		}

 		resolved++

+		// Non-automatic triggers should not be able to trigger deployments.

+		if !t.ImageChangeParams.Automatic {

+			continue

+		}

+

 		// We need stronger checks in order to validate that this template

 		// change is an image change. Look at the deserialized config's

 		// triggers and compare with the present trigger.

@@ -118,6 +134,7 @@ func canTrigger(config, decoded *deployapi.DeploymentConfig) (bool, []deployapi.

 			continue

 		}

+		canTriggerByImageChange = true

 		causes = append(causes, deployapi.DeploymentCause{

 			Type: deployapi.DeploymentTriggerOnImageChange,

 			ImageTrigger: &deployapi.DeploymentCauseImageTrigger{

@@ -130,13 +147,31 @@ func canTrigger(config, decoded *deployapi.DeploymentConfig) (bool, []deployapi.

 		})

 	}

-	if len(causes) == 0 {

-		causes = []deployapi.DeploymentCause{{Type: deployapi.DeploymentTriggerOnConfigChange}}

+	// We need to wait for all images to resolve before triggering a new deployment.

+	if ictCount != resolved {

+		return false, nil

+	}

+

+	// CONFIG CHANGE TRIGGERS

+	canTriggerByConfigChange := false

+	// Our deployment config has a config change trigger and no image change has triggered.

+	// If an image change had happened, it would be enough to start a new deployment without

+	// caring about the config change trigger.

+	if deployutil.HasChangeTrigger(config) && !canTriggerByImageChange {

+		// This is the initial deployment or the config has a template change. We need to

+		// kick a new deployment.

+		if config.Status.LatestVersion == 0 || !kapi.Semantic.DeepEqual(config.Spec.Template, decoded.Spec.Template) {

+			canTriggerByConfigChange = true

+			causes = []deployapi.DeploymentCause{{Type: deployapi.DeploymentTriggerOnConfigChange}}

+		}

 	}

-	return ictCount == resolved, causes

+	return canTriggerByConfigChange || canTriggerByImageChange, causes

 }

+// triggeredByDifferentImage compares the provided image change parameters with those found in the

+// previous deployment config (the one we decoded from the annotations of its latest deployment)

+// and returns whether the two deployment configs have been triggered by a different image change.

 func triggeredByDifferentImage(ictParams deployapi.DeploymentTriggerImageChangeParams, previous deployapi.DeploymentConfig) bool {

 	for _, t := range previous.Spec.Triggers {

 		if t.Type != deployapi.DeploymentTriggerOnImageChange {

@@ -153,10 +188,12 @@ func triggeredByDifferentImage(ictParams deployapi.DeploymentTriggerImageChangeP

 	return false

 }

-func (c *DeploymentTriggerController) updateStatus(config *deployapi.DeploymentConfig, causes []deployapi.DeploymentCause) error {

+// update increments the latestVersion of the provided deployment config so the deployment config

+// controller can run a new deployment and also updates the details of the deployment config.

+func (c *DeploymentTriggerController) update(config *deployapi.DeploymentConfig, causes []deployapi.DeploymentCause) error {

 	config.Status.LatestVersion++

 	config.Status.Details = new(deployapi.DeploymentDetails)

 	config.Status.Details.Causes = causes

-	_, err := c.client.DeploymentConfigs(config.Namespace).UpdateStatus(config)

+	_, err := c.dn.DeploymentConfigs(config.Namespace).UpdateStatus(config)

 	return err

 }

@@ -14,18 +14,15 @@ import (

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

+var codec = kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion)

+

 // TestHandle_newConfigNoTriggers ensures that a change to a config with no

 // triggers doesn't result in a new config version bump.

 func TestHandle_newConfigNoTriggers(t *testing.T) {

 	fake := &testclient.Fake{}

 	kFake := &ktestclient.Fake{}

-	controller := &DeploymentConfigChangeController{

-		client:  fake,

-		kClient: kFake,

-		decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

-			return deployutil.DecodeDeploymentConfig(deployment, kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

-		},

-	}

+

+	controller := NewDeploymentTriggerController(fake, kFake, codec)

 	config := testapi.OkDeploymentConfig(1)

 	config.Namespace = kapi.NamespaceDefault

@@ -54,13 +51,7 @@ func TestHandle_newConfigTriggers(t *testing.T) {

 	})

 	kFake := &ktestclient.Fake{}

-	controller := &DeploymentConfigChangeController{

-		client:  fake,

-		kClient: kFake,

-		decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

-			return deployutil.DecodeDeploymentConfig(deployment, kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

-		},

-	}

+	controller := NewDeploymentTriggerController(fake, kFake, codec)

 	config := testapi.OkDeploymentConfig(0)

 	config.Namespace = kapi.NamespaceDefault

@@ -132,13 +123,7 @@ func TestHandle_changeWithTemplateDiff(t *testing.T) {

 			return true, deployment, nil

 		})

-		controller := &DeploymentConfigChangeController{

-			client:  fake,

-			kClient: kFake,

-			decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

-				return deployutil.DecodeDeploymentConfig(deployment, kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

-			},

-		}

+		controller := NewDeploymentTriggerController(fake, kFake, codec)

 		s.modify(config)

 		if err := controller.Handle(config); err != nil {

@@ -184,13 +169,7 @@ func TestHandle_waitForImageController(t *testing.T) {

 		return true, nil, nil

 	})

-	controller := &DeploymentConfigChangeController{

-		client:  fake,

-		kClient: kFake,

-		decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

-			return deployutil.DecodeDeploymentConfig(deployment, kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

-		},

-	}

+	controller := NewDeploymentTriggerController(fake, kFake, codec)

 	config := testapi.OkDeploymentConfig(0)

 	config.Namespace = kapi.NamespaceDefault

@@ -257,13 +236,7 @@ func TestHandle_automaticImageUpdates(t *testing.T) {

 			return true, deployment, nil

 		})

-		controller := &DeploymentConfigChangeController{

-			client:  fake,

-			kClient: kFake,

-			decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

-				return deployutil.DecodeDeploymentConfig(deployment, kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

-			},

-		}

+		controller := NewDeploymentTriggerController(fake, kFake, codec)

 		config := testapi.OkDeploymentConfig(test.version)

 		config.Namespace = kapi.NamespaceDefault

@@ -284,3 +257,357 @@ func TestHandle_automaticImageUpdates(t *testing.T) {

 		}

 	}

 }

+

+func TestCanTrigger(t *testing.T) {

+	tests := []struct {

+		name string

+

+		config  *deployapi.DeploymentConfig

+		decoded *deployapi.DeploymentConfig

+

+		expected       bool

+		expectedCauses []deployapi.DeploymentCause

+	}{

+		{

+			name: "nil decoded config",

+

+			config:  testapi.OkDeploymentConfig(1),

+			decoded: nil,

+

+			expected:       false,

+			expectedCauses: nil,

+		},

+		{

+			name: "no trigger",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplateChanged(),

+				},

+				Status: testapi.OkDeploymentConfigStatus(1),

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+				},

+				Status: testapi.OkDeploymentConfigStatus(1),

+			},

+

+			expected:       false,

+			expectedCauses: nil,

+		},

+		{

+			name: "config change trigger only",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplateChanged(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(1),

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(1),

+			},

+

+			expected:       true,

+			expectedCauses: testapi.OkConfigChangeDetails().Causes,

+		},

+		{

+			name: "config change trigger only [no change][initial]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+

+			expected:       true,

+			expectedCauses: testapi.OkConfigChangeDetails().Causes,

+		},

+		{

+			name: "config change trigger only [no change]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(1),

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(1),

+			},

+

+			expected:       false,

+			expectedCauses: nil,

+		},

+		{

+			name: "image change trigger only [automatic=false]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplateChanged(), // Irrelevant change

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkNonAutomaticICT(), // Image still to be resolved but it's false anyway

+					},

+				},

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkNonAutomaticICT(),

+					},

+				},

+			},

+

+			expected:       false,

+			expectedCauses: nil,

+		},

+		{

+			name: "image change trigger only [automatic=false][image triggered]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplateChanged(), // Image has been updated in the template but automatic=false

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkTriggeredNonAutomatic(),

+					},

+				},

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkNonAutomaticICT(),

+					},

+				},

+			},

+

+			expected:       false,

+			expectedCauses: nil,

+		},

+		{

+			name: "image change trigger only [automatic=true]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplateChanged(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkTriggeredImageChange(),

+					},

+				},

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkImageChangeTrigger(),

+					},

+				},

+			},

+

+			expected:       true,

+			expectedCauses: testapi.OkImageChangeDetails().Causes,

+		},

+		{

+			name: "image change trigger only [automatic=true][no change]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkImageChangeTrigger(),

+					},

+				},

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkImageChangeTrigger(),

+					},

+				},

+			},

+

+			expected:       false,

+			expectedCauses: nil,

+		},

+		{

+			name: "config change and image change trigger [automatic=false][initial][image resolved]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplateChanged(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkTriggeredNonAutomatic(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkNonAutomaticICT(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+

+			expected:       true,

+			expectedCauses: testapi.OkConfigChangeDetails().Causes,

+		},

+		{

+			name: "config change and image change trigger [automatic=false][initial]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkNonAutomaticICT(), // Image is not resolved yet

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkNonAutomaticICT(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+

+			expected:       false,

+			expectedCauses: nil,

+		},

+		{

+			name: "config change and image change trigger [automatic=true][initial]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplateChanged(), // Pod template has changed but the image in the template is yet to be updated

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkImageChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkImageChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+

+			expected:       false,

+			expectedCauses: nil,

+		},

+		{

+			name: "config change and image change trigger [automatic=true][initial][image triggered]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplateChanged(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkTriggeredImageChange(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkImageChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(0),

+			},

+

+			expected:       true,

+			expectedCauses: testapi.OkImageChangeDetails().Causes,

+		},

+		{

+			name: "config change and image change trigger [automatic=true][no change]",

+

+			config: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkImageChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(1),

+			},

+			decoded: &deployapi.DeploymentConfig{

+				Spec: deployapi.DeploymentConfigSpec{

+					Template: testapi.OkPodTemplate(),

+					Triggers: []deployapi.DeploymentTriggerPolicy{

+						testapi.OkConfigChangeTrigger(),

+						testapi.OkImageChangeTrigger(),

+					},

+				},

+				Status: testapi.OkDeploymentConfigStatus(1),

+			},

+

+			expected:       false,

+			expectedCauses: nil,

+		},

+	}

+

+	for _, test := range tests {

+		got, gotCauses := canTrigger(test.config, test.decoded)

+		if test.expected != got {

+			t.Errorf("%s: expected to trigger: %t, got: %t", test.name, test.expected, got)

+			continue

+		}

+		if !kapi.Semantic.DeepEqual(test.expectedCauses, gotCauses) {

+			t.Errorf("%s: expected causes:\n%#v\ngot:\n%#v", test.name, test.expectedCauses, gotCauses)

+		}

+	}

+}

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

 	osclient "github.com/openshift/origin/pkg/client"

 	controller "github.com/openshift/origin/pkg/controller"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

-	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

 // DeploymentTriggerControllerFactory can create a DeploymentTriggerController that watches all DeploymentConfigs.

@@ -44,13 +43,7 @@ func (factory *DeploymentTriggerControllerFactory) Create() controller.RunnableC

 	eventBroadcaster := record.NewBroadcaster()

 	eventBroadcaster.StartRecordingToSink(factory.KubeClient.Events(""))

-	triggerController := &DeploymentTriggerController{

-		client:  factory.Client,

-		kClient: factory.KubeClient,

-		decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

-			return deployutil.DecodeDeploymentConfig(deployment, factory.Codec)

-		},

-	}

+	triggerController := NewDeploymentTriggerController(factory.Client, factory.KubeClient, factory.Codec)

 	return &controller.RetryController{

 		Queue: queue,