@@ -191,6 +191,15 @@ const (

 	DeploymentCancelledAnnotation = "openshift.io/deployment.cancelled"

 )

+// These constants represent the various reasons for cancelling a deployment

+// or for a deployment being placed in a failed state

+const (

+	DeploymentCancelledByUser                 = "The deployment was cancelled by the user"

+	DeploymentCancelledNewerDeploymentExists  = "The deployment was cancelled as a newer deployment was found running"

+	DeploymentFailedUnrelatedDeploymentExists = "The deployment failed as an unrelated pod with the same name as this deployment is already running"

+	DeploymentFailedDeployerPodNoLongerExists = "The deployment failed as the deployer pod no longer exists"

+)

+

 // DeploymentConfig represents a configuration for a single deployment (represented as a

 // ReplicationController). It also contains details about changes which resulted in the current

 // state of the DeploymentConfig. Each change to the DeploymentConfig which should result in

@@ -188,6 +188,15 @@ const (

 	DeploymentCancelledAnnotation = "openshift.io/deployment.cancelled"

 )

+// These constants represent the various reasons for cancelling a deployment

+// or for a deployment being placed in a failed state

+const (

+	DeploymentCancelledByUser                 = "The deployment was cancelled by the user"

+	DeploymentCancelledNewerDeploymentExists  = "The deployment was cancelled as a newer deployment was found running"

+	DeploymentFailedUnrelatedDeploymentExists = "The deployment failed as an unrelated pod with the same name as this deployment is already running"

+	DeploymentFailedDeployerPodNoLongerExists = "The deployment failed as the deployer pod no longer exists"

+)

+

 // DeploymentConfig represents a configuration for a single deployment (represented as a

 // ReplicationController). It also contains details about changes which resulted in the current

 // state of the DeploymentConfig. Each change to the DeploymentConfig which should result in

@@ -155,6 +155,15 @@ const (

 	DeploymentCancelledAnnotation = "openshift.io/deployment.cancelled"

 )

+// These constants represent the various reasons for cancelling a deployment

+// or for a deployment being placed in a failed state

+const (

+	DeploymentCancelledByUser                 = "The deployment was cancelled by the user"

+	DeploymentCancelledNewerDeploymentExists  = "The deployment was cancelled as a newer deployment was found running"

+	DeploymentFailedUnrelatedDeploymentExists = "The deployment failed as an unrelated pod with the same name as this deployment is already running"

+	DeploymentFailedDeployerPodNoLongerExists = "The deployment failed as the deployer pod no longer exists"

+)

+

 // DeploymentConfig represents a configuration for a single deployment (represented as a

 // ReplicationController). It also contains details about changes which resulted in the current

 // state of the DeploymentConfig. Each change to the DeploymentConfig which should result in

@@ -56,9 +56,41 @@ func (c *DeploymentController) Handle(deployment *kapi.ReplicationController) er

 		deploymentPod, err := c.podClient.createPod(deployment.Namespace, podTemplate)

 		if err != nil {

-			// If the pod already exists, it's possible that a previous CreatePod succeeded but

-			// the deployment state update failed and now we're re-entering.

-			if !kerrors.IsAlreadyExists(err) {

+			if kerrors.IsAlreadyExists(err) {

+				// If the pod already exists, it's possible that a previous CreatePod succeeded but

+				// the deployment state update failed and now we're re-entering.

+				// Ensure that the pod is the one we created by verifying the annotation on it

+				existingPod, err := c.podClient.getPod(deployment.Namespace, deployutil.DeployerPodNameForDeployment(deployment))

+				if err != nil {

+					c.recorder.Eventf(deployment, "failedCreate", "Error getting existing deployer pod for %s: %v", deployutil.LabelForDeployment(deployment), err)

+					return fmt.Errorf("couldn't fetch existing deployer pod for %s: %v", deployutil.LabelForDeployment(deployment), err)

+				}

+				// TODO: Investigate checking the container image of the running pod and

+				// comparing with the intended deployer pod image.

+				// If we do so, we'll need to ensure that changes to 'unrelated' pods

+				// don't result in updates to the deployment

+				// So, the image check will have to be done in other areas of the code as well

+				if deployutil.DeploymentNameFor(existingPod) == deployment.Name {

+					// we'll just set the deploymentPod so that pod name annotation

+					// can be set on the deployment below

+					deploymentPod = existingPod

+				} else {

+					c.recorder.Eventf(deployment, "failedCreate", "Error creating deployer pod for %s since another pod with the same name exists", deployutil.LabelForDeployment(deployment))

+

+					// we seem to have an unrelated pod running with the same name as the deployment

+					// set the deployment status to Failed

+					failedStatus := string(deployapi.DeploymentStatusFailed)

+					deployment.Annotations[deployapi.DeploymentStatusAnnotation] = failedStatus

+					deployment.Annotations[deployapi.DeploymentStatusReasonAnnotation] = deployapi.DeploymentFailedUnrelatedDeploymentExists

+					if _, err := c.deploymentClient.updateDeployment(deployment.Namespace, deployment); err != nil {

+						c.recorder.Eventf(deployment, "failedUpdate", "Error updating deployment %s status to %s", deployutil.LabelForDeployment(deployment), failedStatus)

+						glog.Errorf("Error updating deployment %s status to %s", deployutil.LabelForDeployment(deployment), failedStatus)

+					} else {

+						glog.V(2).Infof("Updated deployment %s status to %s", deployutil.LabelForDeployment(deployment), failedStatus)

+					}

+					return fatalError(fmt.Sprintf("couldn't create deployer pod for %s since an unrelated pod with the same name exists", deployutil.LabelForDeployment(deployment)))

+				}

+			} else {

 				c.recorder.Eventf(deployment, "failedCreate", "Error creating deployer pod for %s: %v", deployutil.LabelForDeployment(deployment), err)

 				return fmt.Errorf("couldn't create deployer pod for %s: %v", deployutil.LabelForDeployment(deployment), err)

 			}

@@ -121,7 +153,7 @@ func (c *DeploymentController) makeDeployerPod(deployment *kapi.ReplicationContr

 	pod := &kapi.Pod{

 		ObjectMeta: kapi.ObjectMeta{

-			GenerateName: deployutil.DeployerPodNameForDeployment(deployment),

+			Name: deployutil.DeployerPodNameForDeployment(deployment),

 			Annotations: map[string]string{

 				deployapi.DeploymentAnnotation: deployment.Name,

 			},

@@ -154,6 +186,7 @@ type deploymentClient interface {

 // podClient abstracts access to pods.

 type podClient interface {

+	getPod(namespace, name string) (*kapi.Pod, error)

 	createPod(namespace string, pod *kapi.Pod) (*kapi.Pod, error)

 	deletePod(namespace, name string) error

 }

@@ -174,10 +207,15 @@ func (i *deploymentClientImpl) updateDeployment(namespace string, deployment *ka

 // podClientImpl is a pluggable podClient.

 type podClientImpl struct {

+	getPodFunc    func(namespace, name string) (*kapi.Pod, error)

 	createPodFunc func(namespace string, pod *kapi.Pod) (*kapi.Pod, error)

 	deletePodFunc func(namespace, name string) error

 }

+func (i *podClientImpl) getPod(namespace, name string) (*kapi.Pod, error) {

+	return i.getPodFunc(namespace, name)

+}

+

 func (i *podClientImpl) createPod(namespace string, pod *kapi.Pod) (*kapi.Pod, error) {

 	return i.createPodFunc(namespace, pod)

 }

@@ -37,7 +37,6 @@ func TestHandle_createPodOk(t *testing.T) {

 		podClient: &podClientImpl{

 			createPodFunc: func(namespace string, pod *kapi.Pod) (*kapi.Pod, error) {

 				createdPod = pod

-				pod.Name = pod.GenerateName

 				return pod, nil

 			},

 		},

@@ -189,21 +188,31 @@ func TestHandle_createPodFail(t *testing.T) {

 	}

 }

-// TestHandle_createPodAlreadyExists ensures that attempts to create a

+// TestHandle_deployerPodAlreadyExists ensures that attempts to create a

 // deployer pod which  was already created don't result in an error

 // (effectively skipping the handling as redundant).

-func TestHandle_createPodAlreadyExists(t *testing.T) {

+func TestHandle_deployerPodAlreadyExists(t *testing.T) {

+	var updatedDeployment *kapi.ReplicationController

+

+	config := deploytest.OkDeploymentConfig(1)

+	deployment, _ := deployutil.MakeDeployment(config, kapi.Codec)

+	deployment.Annotations[deployapi.DeploymentStatusAnnotation] = string(deployapi.DeploymentStatusNew)

+	deployerPod := relatedPod(deployment)

+

 	controller := &DeploymentController{

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

 			return deployutil.DecodeDeploymentConfig(deployment, api.Codec)

 		},

 		deploymentClient: &deploymentClientImpl{

 			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

-				t.Fatalf("unexpected deployment update")

-				return nil, nil

+				updatedDeployment = deployment

+				return updatedDeployment, nil

 			},

 		},

 		podClient: &podClientImpl{

+			getPodFunc: func(namespace, name string) (*kapi.Pod, error) {

+				return deployerPod, nil

+			},

 			createPodFunc: func(namespace string, pod *kapi.Pod) (*kapi.Pod, error) {

 				return nil, kerrors.NewAlreadyExists("Pod", pod.Name)

 			},

@@ -214,15 +223,74 @@ func TestHandle_createPodAlreadyExists(t *testing.T) {

 		recorder: &record.FakeRecorder{},

 	}

-	// Verify no-op

-	config := deploytest.OkDeploymentConfig(1)

-	deployment, _ := deployutil.MakeDeployment(config, kapi.Codec)

-	deployment.Annotations[deployapi.DeploymentStatusAnnotation] = string(deployapi.DeploymentStatusPending)

 	err := controller.Handle(deployment)

 	if err != nil {

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

 	}

+

+	if updatedDeployment.Annotations[deployapi.DeploymentPodAnnotation] != deployerPod.Name {

+		t.Fatalf("deployment not updated with pod name annotation")

+	}

+

+	if updatedDeployment.Annotations[deployapi.DeploymentStatusAnnotation] != string(deployapi.DeploymentStatusPending) {

+		t.Fatalf("deployment status not updated to pending")

+	}

+}

+

+// TestHandle_unrelatedPodAlreadyExists ensures that attempts to create a

+// deployer pod, when a pod with the same name but missing annotations

+// results in an error

+func TestHandle_unrelatedPodAlreadyExists(t *testing.T) {

+	var updatedDeployment *kapi.ReplicationController

+

+	config := deploytest.OkDeploymentConfig(1)

+	deployment, _ := deployutil.MakeDeployment(config, kapi.Codec)

+	deployment.Annotations[deployapi.DeploymentStatusAnnotation] = string(deployapi.DeploymentStatusNew)

+	otherPod := unrelatedPod(deployment)

+

+	controller := &DeploymentController{

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

+			return deployutil.DecodeDeploymentConfig(deployment, api.Codec)

+		},

+		deploymentClient: &deploymentClientImpl{

+			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

+				updatedDeployment = deployment

+				return updatedDeployment, nil

+			},

+		},

+		podClient: &podClientImpl{

+			getPodFunc: func(namespace, name string) (*kapi.Pod, error) {

+				return otherPod, nil

+			},

+			createPodFunc: func(namespace string, pod *kapi.Pod) (*kapi.Pod, error) {

+				return nil, kerrors.NewAlreadyExists("Pod", pod.Name)

+			},

+		},

+		makeContainer: func(strategy *deployapi.DeploymentStrategy) (*kapi.Container, error) {

+			return okContainer(), nil

+		},

+		recorder: &record.FakeRecorder{},

+	}

+

+	err := controller.Handle(deployment)

+

+	if err == nil {

+		t.Fatalf("expected error")

+	}

+

+	if _, isFatal := err.(fatalError); !isFatal {

+		t.Fatalf("expected a fatal error, got a %#v", err)

+	}

+

+	if _, exists := updatedDeployment.Annotations[deployapi.DeploymentPodAnnotation]; exists {

+		t.Fatalf("deployment updated with pod name annotation")

+	}

+

+	status := updatedDeployment.Annotations[deployapi.DeploymentStatusAnnotation]

+	if status != string(deployapi.DeploymentStatusFailed) {

+		t.Fatalf("expected deployment status: Failed. found: %s", status)

+	}

 }

 // TestHandle_noop ensures that pending, running, and failed states result in

@@ -426,3 +494,25 @@ func okContainer() *kapi.Container {

 		},

 	}

 }

+

+func relatedPod(deployment *kapi.ReplicationController) *kapi.Pod {

+	return &kapi.Pod{

+		ObjectMeta: kapi.ObjectMeta{

+			Name: deployment.Name,

+			Annotations: map[string]string{

+				deployapi.DeploymentAnnotation: deployment.Name,

+			},

+		},

+	}

+}

+

+func unrelatedPod(deployment *kapi.ReplicationController) *kapi.Pod {

+	return &kapi.Pod{

+		ObjectMeta: kapi.ObjectMeta{

+			Name: deployment.Name,

+			Annotations: map[string]string{

+				"unrelatedKey": "unrelatedValue",

+			},

+		},

+	}

+}

@@ -58,6 +58,9 @@ func (factory *DeploymentControllerFactory) Create() controller.RunnableControll

 			},

 		},

 		podClient: &podClientImpl{

+			getPodFunc: func(namespace, name string) (*kapi.Pod, error) {

+				return factory.KubeClient.Pods(namespace).Get(name)

+			},

 			createPodFunc: func(namespace string, pod *kapi.Pod) (*kapi.Pod, error) {

 				return factory.KubeClient.Pods(namespace).Create(pod)

 			},

@@ -52,7 +52,7 @@ func LatestDeploymentNameForConfig(config *deployapi.DeploymentConfig) string {

 }

 func DeployerPodNameForDeployment(deployment *api.ReplicationController) string {

-	return fmt.Sprintf("deploy-%s", deployment.Name)

+	return deployment.Name

 }

 // LabelForDeployment builds a string identifier for a Deployment.