From 8a3ab316454ce4d8e00e8edf60c73a93d9f5f6ca Mon Sep 17 00:00:00 2001
From: Sean Eagan <seaneagan1@gmail.com>
Date: Fri, 28 Aug 2020 15:04:58 -0500
Subject: [PATCH] Wait for at least 1 replica for Deployments and Daemonsets

The wait logic for Deployments and Daemonsets subtracts their
maxUnavailable value from the amount of replicas they should
have ready. This can lead to waiting for 0 pods to be ready.
This change ensures at least 1 replica is ready, unless there
are 0 desired replicas.

Fixes #8660.

Signed-off-by: Sean Eagan <seaneagan1@gmail.com>
---
 pkg/kube/wait.go | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index c3beb232d..d83f13862 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -220,7 +220,17 @@ func (w *waiter) volumeReady(v *corev1.PersistentVolumeClaim) bool {
 }
 
 func (w *waiter) deploymentReady(rs *appsv1.ReplicaSet, dep *appsv1.Deployment) bool {
+	// If there are no desired replicas, there will be nothing to wait for.
+	if *dep.Spec.Replicas == 0 {
+		return true
+	}
+
+	// Ensure the expected available replicas are ready.
 	expectedReady := *dep.Spec.Replicas - deploymentutil.MaxUnavailable(*dep)
+	// Also ensure at least 1 replica is ready.
+	if expectedReady < 1 {
+		expectedReady = 1
+	}
 	if !(rs.Status.ReadyReplicas >= expectedReady) {
 		w.log("Deployment is not ready: %s/%s. %d out of %d expected pods are ready", dep.Namespace, dep.Name, rs.Status.ReadyReplicas, expectedReady)
 		return false
@@ -234,11 +244,18 @@ func (w *waiter) daemonSetReady(ds *appsv1.DaemonSet) bool {
 		return true
 	}
 
+	// If there are no desired replicas, there will be nothing to wait for.
+	if ds.Status.DesiredNumberScheduled == 0 {
+		return true
+	}
+
 	// Make sure all the updated pods have been scheduled
 	if ds.Status.UpdatedNumberScheduled != ds.Status.DesiredNumberScheduled {
 		w.log("DaemonSet is not ready: %s/%s. %d out of %d expected pods have been scheduled", ds.Namespace, ds.Name, ds.Status.UpdatedNumberScheduled, ds.Status.DesiredNumberScheduled)
 		return false
 	}
+
+	// Ensure the expected available replicas are ready.
 	maxUnavailable, err := intstr.GetValueFromIntOrPercent(ds.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable, int(ds.Status.DesiredNumberScheduled), true)
 	if err != nil {
 		// If for some reason the value is invalid, set max unavailable to the
@@ -246,8 +263,11 @@ func (w *waiter) daemonSetReady(ds *appsv1.DaemonSet) bool {
 		// `MaxUnavailable` function in deploymentutil
 		maxUnavailable = int(ds.Status.DesiredNumberScheduled)
 	}
-
 	expectedReady := int(ds.Status.DesiredNumberScheduled) - maxUnavailable
+	// Also ensure at least 1 replica is ready.
+	if expectedReady < 1 {
+		expectedReady = 1
+	}
 	if !(int(ds.Status.NumberReady) >= expectedReady) {
 		w.log("DaemonSet is not ready: %s/%s. %d out of %d expected pods are ready", ds.Namespace, ds.Name, ds.Status.NumberReady, expectedReady)
 		return false