Fix potential problem when scaling --replicas=0

We have defensive code for checking if newRS != nil for DeploymentProgressing and DeploymentTimedOut but not for DeploymentComplete. Let's add the check here as well as this problem was seen in the wild.

Fix potential problem when scaling --replicas=0
5690ba62 · Davanum Srinivas · 175a6dee · 5690ba62
Commit 5690ba62 authored Oct 09, 2017 by Davanum Srinivas
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

progress.go pkg/controller/deployment/progress.go +4 -1

No files found.
--- a/pkg/controller/deployment/progress.go
+++ b/pkg/controller/deployment/progress.go
@@ -52,7 +52,10 @@ func (dc *DeploymentController) syncRolloutStatus(allRSs []*extensions.ReplicaSe
 		case util.DeploymentComplete(d, &newStatus):
 			// Update the deployment conditions with a message for the new replica set that
 			// was successfully deployed. If the condition already exists, we ignore this update.
-			msg := fmt.Sprintf("ReplicaSet %q has successfully progressed.", newRS.Name)
+			msg := fmt.Sprintf("Deployment %q has successfully progressed.", d.Name)
+			if newRS != nil {
+				msg = fmt.Sprintf("ReplicaSet %q has successfully progressed.", newRS.Name)
+			}
 			condition := util.NewDeploymentCondition(extensions.DeploymentProgressing, v1.ConditionTrue, util.NewRSAvailableReason, msg)
 			util.SetDeploymentCondition(&newStatus, *condition)