Merge pull request #10625 from zhaosijun/deploymentModify2

Merged by openshift-bot

Author: OpenShift Bot

pkg/deploy/controller/deployment/controller.go

@@ -106,14 +106,35 @@ func (c *DeploymentController) Handle(deployment *kapi.ReplicationController) er
 			break
 		}
 
-		// 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, and throw a retryable error.
-		if deployerErr != nil && !kerrors.IsNotFound(deployerErr) {
+		switch {
+		case kerrors.IsNotFound(deployerErr):
+			if _, ok := deployment.Annotations[deployapi.DeploymentIgnorePodAnnotation]; ok {
+				return nil
+			}
+
+			// Generate a deployer pod spec.
+			deployerPod, err := c.makeDeployerPod(deployment)
+			if err != nil {
+				return fatalError(fmt.Sprintf("couldn't make deployer pod for %s: %v", deployutil.LabelForDeployment(deployment), err))
+			}
+			// Create the deployer pod.
+			deploymentPod, err := c.pn.Pods(deployment.Namespace).Create(deployerPod)
+			// Retry on error.
+			if err != nil {
+				return actionableError(fmt.Sprintf("couldn't create deployer pod for %s: %v", deployutil.LabelForDeployment(deployment), err))
+			}
+			updatedAnnotations[deployapi.DeploymentPodAnnotation] = deploymentPod.Name
+			nextStatus = deployapi.DeploymentStatusPending
+			glog.V(4).Infof("Created deployer pod %s for deployment %s", deploymentPod.Name, deployutil.LabelForDeployment(deployment))
+
+		case deployerErr != 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. Ensure that the pod is the one we created by verifying the
+			// annotation on it, and throw a retryable error.
 			return fmt.Errorf("couldn't fetch existing deployer pod for %s: %v", deployutil.LabelForDeployment(deployment), deployerErr)
-		}
-		if deployerErr == nil && deployer != nil {
+
+		default: /* deployerErr == nil */
 			// Do a stronger check to validate that the existing deployer pod is
 			// actually for this deployment, and if not, fail this deployment.
 			//
@@ -133,28 +154,7 @@ func (c *DeploymentController) Handle(deployment *kapi.ReplicationController) er
 				nextStatus = nextStatusComp(nextStatus, deployapi.DeploymentStatusPending)
 				glog.V(4).Infof("Detected existing deployer pod %s for deployment %s", deployer.Name, deployutil.LabelForDeployment(deployment))
 			}
-			// Don't try and re-create the deployer pod.
-			break
-		}
-
-		if _, ok := deployment.Annotations[deployapi.DeploymentIgnorePodAnnotation]; ok {
-			return nil
-		}
-
-		// Generate a deployer pod spec.
-		deployerPod, err := c.makeDeployerPod(deployment)
-		if err != nil {
-			return fatalError(fmt.Sprintf("couldn't make deployer pod for %s: %v", deployutil.LabelForDeployment(deployment), err))
-		}
-		// Create the deployer pod.
-		deploymentPod, err := c.pn.Pods(deployment.Namespace).Create(deployerPod)
-		// Retry on error.
-		if err != nil {
-			return actionableError(fmt.Sprintf("couldn't create deployer pod for %s: %v", deployutil.LabelForDeployment(deployment), err))
 		}
-		updatedAnnotations[deployapi.DeploymentPodAnnotation] = deploymentPod.Name
-		nextStatus = deployapi.DeploymentStatusPending
-		glog.V(4).Infof("Created deployer pod %s for deployment %s", deploymentPod.Name, deployutil.LabelForDeployment(deployment))
 
 	case deployapi.DeploymentStatusPending, deployapi.DeploymentStatusRunning:
 		switch {