kubectl rollout status waits for available pods

It's less surprising to the user for kubectl rollout status to wait until
DeploymentStatus.UpdatedReplicas == DeploymentStatus.Replics == DeploymentStatus.AvailableReplicas

pkg/kubectl/rollout_status.go

@@ -48,10 +48,16 @@ func (s *DeploymentStatusViewer) Status(namespace, name string) (string, bool, e
 		return "", false, err
 	}
 	if deployment.Generation <= deployment.Status.ObservedGeneration {
-		if deployment.Status.UpdatedReplicas == deployment.Spec.Replicas {
-			return fmt.Sprintf("deployment %s successfully rolled out\n", name), true, nil
+		if deployment.Status.UpdatedReplicas < deployment.Spec.Replicas {
+			return fmt.Sprintf("Waiting for rollout to finish: %d out of %d new replicas have been updated...\n", deployment.Status.UpdatedReplicas, deployment.Spec.Replicas), false, nil
 		}
-		return fmt.Sprintf("Waiting for rollout to finish: %d out of %d new replicas have been updated...\n", deployment.Status.UpdatedReplicas, deployment.Spec.Replicas), false, nil
+		if deployment.Status.Replicas > deployment.Status.UpdatedReplicas {
+			return fmt.Sprintf("Waiting for rollout to finish: %d old replicas are pending termination...\n", deployment.Status.Replicas-deployment.Status.UpdatedReplicas), false, nil
+		}
+		if deployment.Status.AvailableReplicas < deployment.Status.UpdatedReplicas {
+			return fmt.Sprintf("Waiting for rollout to finish: %d of %d updated replicas are available...\n", deployment.Status.AvailableReplicas, deployment.Status.UpdatedReplicas), false, nil
+		}
+		return fmt.Sprintf("deployment %s successfully rolled out\n", name), true, nil
 	}
 	return fmt.Sprintf("Waiting for deployment spec update to be observed...\n"), false, nil
 }

pkg/kubectl/rollout_status_test.go

@@ -0,0 +1,137 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubectl
+
+import (
+	"testing"
+
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
+)
+
+func TestDeploymentStatusViewerStatus(t *testing.T) {
+	tests := []struct {
+		generation   int64
+		specReplicas int32
+		status       extensions.DeploymentStatus
+		msg          string
+		done         bool
+	}{
+		{
+			generation:   0,
+			specReplicas: 1,
+			status: extensions.DeploymentStatus{
+				ObservedGeneration:  1,
+				Replicas:            1,
+				UpdatedReplicas:     0,
+				AvailableReplicas:   1,
+				UnavailableReplicas: 0,
+			},
+
+			msg:  "Waiting for rollout to finish: 0 out of 1 new replicas have been updated...\n",
+			done: false,
+		},
+		{
+			generation:   1,
+			specReplicas: 1,
+			status: extensions.DeploymentStatus{
+				ObservedGeneration:  1,
+				Replicas:            2,
+				UpdatedReplicas:     1,
+				AvailableReplicas:   2,
+				UnavailableReplicas: 0,
+			},
+
+			msg:  "Waiting for rollout to finish: 1 old replicas are pending termination...\n",
+			done: false,
+		},
+		{
+			generation:   1,
+			specReplicas: 2,
+			status: extensions.DeploymentStatus{
+				ObservedGeneration:  1,
+				Replicas:            2,
+				UpdatedReplicas:     2,
+				AvailableReplicas:   1,
+				UnavailableReplicas: 1,
+			},
+
+			msg:  "Waiting for rollout to finish: 1 of 2 updated replicas are available...\n",
+			done: false,
+		},
+		{
+			generation:   1,
+			specReplicas: 2,
+			status: extensions.DeploymentStatus{
+				ObservedGeneration:  1,
+				Replicas:            2,
+				UpdatedReplicas:     2,
+				AvailableReplicas:   2,
+				UnavailableReplicas: 0,
+			},
+
+			msg:  "deployment foo successfully rolled out\n",
+			done: true,
+		},
+		{
+			generation:   2,
+			specReplicas: 2,
+			status: extensions.DeploymentStatus{
+				ObservedGeneration:  1,
+				Replicas:            2,
+				UpdatedReplicas:     2,
+				AvailableReplicas:   2,
+				UnavailableReplicas: 0,
+			},
+
+			msg:  "Waiting for deployment spec update to be observed...\n",
+			done: false,
+		},
+	}
+
+	for _, test := range tests {
+		d := &extensions.Deployment{
+			ObjectMeta: api.ObjectMeta{
+				Name:       "foo",
+				UID:        "8764ae47-9092-11e4-8393-42010af018ff",
+				Generation: test.generation,
+			},
+			Spec: extensions.DeploymentSpec{
+				Replicas: test.specReplicas,
+			},
+			Status: test.status,
+		}
+		client := testclient.NewSimpleFake(d).Extensions()
+		dsv := &DeploymentStatusViewer{c: client}
+		msg, done, err := dsv.Status("bar", "foo")
+		if err != nil {
+			t.Fatalf("DeploymentStatusViewer.Status(): %v", err)
+		}
+		if done != test.done || msg != test.msg {
+			t.Errorf("DeploymentStatusViewer.Status() for deployment with generation %d, %d replicas specified, and status %+v returned %q, %t, want %q, %t",
+				test.generation,
+				test.specReplicas,
+				test.status,
+				msg,
+				done,
+				test.msg,
+				test.done,
+			)
+		}
+	}
+}