@@ -26,6 +26,24 @@ func OkDeploymentConfigStatus(version int) deployapi.DeploymentConfigStatus {

 	}

 }

+func OkImageChangeDetails() *deployapi.DeploymentDetails {

+	return &deployapi.DeploymentDetails{

+		Causes: []*deployapi.DeploymentCause{{

+			Type: deployapi.DeploymentTriggerOnImageChange,

+			ImageTrigger: &deployapi.DeploymentCauseImageTrigger{

+				From: kapi.ObjectReference{

+					Name: imageapi.JoinImageStreamTag("test", "tag"),

+					Kind: "ImageStreamTag",

+				}}}}}

+}

+

+func OkConfigChangeDetails() *deployapi.DeploymentDetails {

+	return &deployapi.DeploymentDetails{

+		Causes: []*deployapi.DeploymentCause{{

+			Type: deployapi.DeploymentTriggerOnConfigChange,

+		}}}

+}

+

 func OkStrategy() deployapi.DeploymentStrategy {

 	return deployapi.DeploymentStrategy{

 		Type: deployapi.DeploymentStrategyTypeRecreate,

@@ -39,7 +39,7 @@ func (c *DeploymentConfigChangeController) Handle(config *deployapi.DeploymentCo

 	}

 	if config.Status.LatestVersion == 0 {

-		_, _, err := c.generateDeployment(config)

+		_, _, abort, err := c.generateDeployment(config)

 		if err != nil {

 			if kerrors.IsConflict(err) {

 				return fatalError(fmt.Sprintf("DeploymentConfig %s updated since retrieval; aborting trigger: %v", deployutil.LabelForDeploymentConfig(config), err))

@@ -47,7 +47,9 @@ func (c *DeploymentConfigChangeController) Handle(config *deployapi.DeploymentCo

 			glog.V(4).Infof("Couldn't create initial deployment for deploymentConfig %q: %v", deployutil.LabelForDeploymentConfig(config), err)

 			return nil

 		}

-		glog.V(4).Infof("Created initial deployment for deploymentConfig %q", deployutil.LabelForDeploymentConfig(config))

+		if !abort {

+			glog.V(4).Infof("Created initial deployment for deploymentConfig %q", deployutil.LabelForDeploymentConfig(config))

+		}

 		return nil

 	}

@@ -76,21 +78,31 @@ func (c *DeploymentConfigChangeController) Handle(config *deployapi.DeploymentCo

 	}

 	// There was a template diff, so generate a new config version.

-	fromVersion, toVersion, err := c.generateDeployment(config)

+	fromVersion, toVersion, abort, err := c.generateDeployment(config)

 	if err != nil {

 		if kerrors.IsConflict(err) {

 			return fatalError(fmt.Sprintf("DeploymentConfig %s updated since retrieval; aborting trigger: %v", deployutil.LabelForDeploymentConfig(config), err))

 		}

 		return fmt.Errorf("couldn't generate deployment for DeploymentConfig %s: %v", deployutil.LabelForDeploymentConfig(config), err)

 	}

-	glog.V(4).Infof("Updated DeploymentConfig %s from version %d to %d for existing deployment %s", deployutil.LabelForDeploymentConfig(config), fromVersion, toVersion, deployutil.LabelForDeployment(deployment))

+	if !abort {

+		glog.V(4).Infof("Updated DeploymentConfig %s from version %d to %d for existing deployment %s", deployutil.LabelForDeploymentConfig(config), fromVersion, toVersion, deployutil.LabelForDeployment(deployment))

+	}

 	return nil

 }

-func (c *DeploymentConfigChangeController) generateDeployment(config *deployapi.DeploymentConfig) (int, int, error) {

+func (c *DeploymentConfigChangeController) generateDeployment(config *deployapi.DeploymentConfig) (int, int, bool, error) {

 	newConfig, err := c.changeStrategy.generateDeploymentConfig(config.Namespace, config.Name)

 	if err != nil {

-		return config.Status.LatestVersion, 0, err

+		return -1, -1, false, err

+	}

+

+	// The generator returns a cause only when there is an image change. If the configchange

+	// controller detects an image change, it should just quit, otherwise it is racing with

+	// the imagechange controller.

+	if newConfig.Status.LatestVersion != config.Status.LatestVersion &&

+		newConfig.Status.Details != nil && len(newConfig.Status.Details.Causes) > 0 {

+		return -1, -1, true, nil

 	}

 	if newConfig.Status.LatestVersion == config.Status.LatestVersion {

@@ -112,10 +124,10 @@ func (c *DeploymentConfigChangeController) generateDeployment(config *deployapi.

 	// current config will be captured in future events.

 	updatedConfig, err := c.changeStrategy.updateDeploymentConfig(config.Namespace, newConfig)

 	if err != nil {

-		return config.Status.LatestVersion, newConfig.Status.LatestVersion, err

+		return config.Status.LatestVersion, newConfig.Status.LatestVersion, false, err

 	}

-	return config.Status.LatestVersion, updatedConfig.Status.LatestVersion, nil

+	return config.Status.LatestVersion, updatedConfig.Status.LatestVersion, false, nil

 }

 // changeStrategy knows how to generate and update DeploymentConfigs.

@@ -170,3 +170,45 @@ func TestHandle_changeWithTemplateDiff(t *testing.T) {

 		}

 	}

 }

+

+func TestHandle_raceWithTheImageController(t *testing.T) {

+	var updated *deployapi.DeploymentConfig

+

+	controller := &DeploymentConfigChangeController{

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

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

+		},

+		changeStrategy: &changeStrategyImpl{

+			generateDeploymentConfigFunc: func(namespace, name string) (*deployapi.DeploymentConfig, error) {

+				generated := deployapitest.OkDeploymentConfig(1)

+				generated.Status.Details = deployapitest.OkImageChangeDetails()

+				updated = generated

+				return generated, nil

+			},

+			updateDeploymentConfigFunc: func(namespace string, config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {

+				t.Errorf("an update should never run in the presence of races")

+				updated.Status.Details = deployapitest.OkConfigChangeDetails()

+				return updated, nil

+			},

+		},

+	}

+

+	config := deployapitest.OkDeploymentConfig(0)

+	config.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{deployapitest.OkConfigChangeTrigger(), deployapitest.OkImageChangeTrigger()}

+

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

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

+	}

+

+	if e, a := 1, updated.Status.LatestVersion; e != a {

+		t.Fatalf("expected update to latestversion=%d, got %d", e, a)

+	}

+

+	if updated.Status.Details == nil {

+		t.Fatalf("expected config change details to be set")

+	} else if updated.Status.Details.Causes == nil {

+		t.Fatalf("expected config change causes to be set")

+	} else if updated.Status.Details.Causes[0].Type != deployapi.DeploymentTriggerOnImageChange {

+		t.Fatalf("expected config change cause to be set to image change trigger, got %s", updated.Status.Details.Causes[0].Type)

+	}

+}