Merge pull request #11658 from kargakis/fix-condition-hotloop

Merged by openshift-bot
openshift · Nov 1, 2016 · 63642d6 · 63642d6
2 parents 899f139 + 6b52405
commit 63642d6
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/pkg/deploy/controller/deploymentconfig/controller.go b/pkg/deploy/controller/deploymentconfig/controller.go
@@ -329,16 +329,15 @@ func (c *DeploymentConfigController) calculateStatus(config deployapi.Deployment
 		Conditions:          config.Status.Conditions,
 	}
 
-	isProgressing := deployutil.IsProgressing(config, status)
-	updateConditions(config, &status, latestRC, isProgressing)
+	updateConditions(config, &status, latestRC)
 	for _, cond := range additional {
 		deployutil.SetDeploymentCondition(&status, cond)
 	}
 
 	return status, nil
 }
 
-func updateConditions(config deployapi.DeploymentConfig, newStatus *deployapi.DeploymentConfigStatus, latestRC *kapi.ReplicationController, isProgressing bool) {
+func updateConditions(config deployapi.DeploymentConfig, newStatus *deployapi.DeploymentConfigStatus, latestRC *kapi.ReplicationController) {
 	// Availability condition.
 	if newStatus.AvailableReplicas >= config.Spec.Replicas-deployutil.MaxUnavailable(config) && newStatus.AvailableReplicas > 0 {
 		minAvailability := deployutil.NewDeploymentCondition(deployapi.DeploymentAvailable, kapi.ConditionTrue, "", "Deployment config has minimum availability.")
@@ -349,15 +348,14 @@ func updateConditions(config deployapi.DeploymentConfig, newStatus *deployapi.De
 	}
 
 	// Condition about progress.
-	cond := deployutil.GetDeploymentCondition(*newStatus, deployapi.DeploymentProgressing)
 	if latestRC != nil {
 		switch deployutil.DeploymentStatusFor(latestRC) {
 		case deployapi.DeploymentStatusPending:
 			msg := fmt.Sprintf("Waiting on deployer pod for replication controller %q to be scheduled", latestRC.Name)
 			condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionUnknown, "", msg)
 			deployutil.SetDeploymentCondition(newStatus, *condition)
 		case deployapi.DeploymentStatusRunning:
-			if isProgressing {
+			if deployutil.IsProgressing(config, *newStatus) {
 				deployutil.RemoveDeploymentCondition(newStatus, deployapi.DeploymentProgressing)
 				msg := fmt.Sprintf("Replication controller %q is progressing", latestRC.Name)
 				condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionTrue, deployutil.ReplicationControllerUpdatedReason, msg)
@@ -375,19 +373,6 @@ func updateConditions(config deployapi.DeploymentConfig, newStatus *deployapi.De
 			deployutil.SetDeploymentCondition(newStatus, *condition)
 		}
 	}
-	// Pause / resume condition. Since we don't pause running deployments, let's use paused conditions only when a deployment
-	// actually terminates. For now it may be ok to override lack of progress in the conditions, later we may want to separate
-	// paused from the rest of the progressing conditions.
-	if latestRC == nil || deployutil.IsTerminatedDeployment(latestRC) {
-		pausedCondExists := cond != nil && cond.Reason == deployutil.PausedDeployReason
-		if config.Spec.Paused && !pausedCondExists {
-			condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionUnknown, deployutil.PausedDeployReason, "Deployment config is paused")
-			deployutil.SetDeploymentCondition(newStatus, *condition)
-		} else if !config.Spec.Paused && pausedCondExists {
-			condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionUnknown, deployutil.ResumedDeployReason, "Deployment config is resumed")
-			deployutil.SetDeploymentCondition(newStatus, *condition)
-		}
-	}
 }
 
 func (c *DeploymentConfigController) handleErr(err error, key interface{}) {