Revert "kubectl: respect deployment strategy parameters for rollout status"

This reverts commit d20ac8766e.

pkg/kubectl/rollout_status_test.go

@@ -20,24 +20,17 @@ import (
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	intstrutil "k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
 )
 
-func intOrStringP(i int) *intstrutil.IntOrString {
-	intstr := intstrutil.FromInt(i)
-	return &intstr
-}
-
 func TestDeploymentStatusViewerStatus(t *testing.T) {
 	tests := []struct {
-		generation     int64
-		specReplicas   int32
-		maxUnavailable *intstrutil.IntOrString
-		status         extensions.DeploymentStatus
-		msg            string
-		done           bool
+		generation   int64
+		specReplicas int32
+		status       extensions.DeploymentStatus
+		msg          string
+		done         bool
 	}{
 		{
 			generation:   0,
@@ -68,9 +61,8 @@ func TestDeploymentStatusViewerStatus(t *testing.T) {
 			done: false,
 		},
 		{
-			generation:     1,
-			specReplicas:   2,
-			maxUnavailable: intOrStringP(0),
+			generation:   1,
+			specReplicas: 2,
 			status: extensions.DeploymentStatus{
 				ObservedGeneration:  1,
 				Replicas:            2,
@@ -79,7 +71,7 @@ func TestDeploymentStatusViewerStatus(t *testing.T) {
 				UnavailableReplicas: 1,
 			},
 
-			msg:  "Waiting for rollout to finish: 1 of 2 updated replicas are available (minimum required: 2)...\n",
+			msg:  "Waiting for rollout to finish: 1 of 2 updated replicas are available...\n",
 			done: false,
 		},
 		{
@@ -110,26 +102,9 @@ func TestDeploymentStatusViewerStatus(t *testing.T) {
 			msg:  "Waiting for deployment spec update to be observed...\n",
 			done: false,
 		},
-		{
-			generation:     1,
-			specReplicas:   2,
-			maxUnavailable: intOrStringP(1),
-			status: extensions.DeploymentStatus{
-				ObservedGeneration:  1,
-				Replicas:            2,
-				UpdatedReplicas:     2,
-				AvailableReplicas:   1,
-				UnavailableReplicas: 0,
-			},
-
-			msg:  "deployment \"foo\" successfully rolled out\n",
-			done: true,
-		},
 	}
 
-	for i := range tests {
-		test := tests[i]
-		t.Logf("testing scenario %d", i)
+	for _, test := range tests {
 		d := &extensions.Deployment{
 			ObjectMeta: metav1.ObjectMeta{
 				Namespace:  "bar",
@@ -138,27 +113,18 @@ func TestDeploymentStatusViewerStatus(t *testing.T) {
 				Generation: test.generation,
 			},
 			Spec: extensions.DeploymentSpec{
-				Strategy: extensions.DeploymentStrategy{
-					Type: extensions.RollingUpdateDeploymentStrategyType,
-					RollingUpdate: &extensions.RollingUpdateDeployment{
-						MaxSurge: *intOrStringP(1),
-					},
-				},
 				Replicas: test.specReplicas,
 			},
 			Status: test.status,
 		}
-		if test.maxUnavailable != nil {
-			d.Spec.Strategy.RollingUpdate.MaxUnavailable = *test.maxUnavailable
-		}
 		client := fake.NewSimpleClientset(d).Extensions()
 		dsv := &DeploymentStatusViewer{c: client}
 		msg, done, err := dsv.Status("bar", "foo", 0)
 		if err != nil {
-			t.Fatalf("unexpected error: %v", err)
+			t.Fatalf("DeploymentStatusViewer.Status(): %v", err)
 		}
 		if done != test.done || msg != test.msg {
-			t.Errorf("deployment with generation %d, %d replicas specified, and status:\n%+v\nreturned:\n%q, %t\nwant:\n%q, %t",
+			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,