Add a test case and consolidate deployment constructors

pkg/controller/deployment/deployment_controller_test.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	exp "k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
 	"k8s.io/kubernetes/pkg/client/record"
 	"k8s.io/kubernetes/pkg/client/testing/core"
@@ -38,14 +38,14 @@ var (
 	noTimestamp = unversioned.Time{}
 )
 
-func rs(name string, replicas int, selector map[string]string, timestamp unversioned.Time) *exp.ReplicaSet {
-	return &exp.ReplicaSet{
+func rs(name string, replicas int, selector map[string]string, timestamp unversioned.Time) *extensions.ReplicaSet {
+	return &extensions.ReplicaSet{
 		ObjectMeta: api.ObjectMeta{
 			Name:              name,
 			CreationTimestamp: timestamp,
 			Namespace:         api.NamespaceDefault,
 		},
-		Spec: exp.ReplicaSetSpec{
+		Spec: extensions.ReplicaSetSpec{
 			Replicas: int32(replicas),
 			Selector: &unversioned.LabelSelector{MatchLabels: selector},
 			Template: api.PodTemplateSpec{},
@@ -53,61 +53,32 @@ func rs(name string, replicas int, selector map[string]string, timestamp unversi
 	}
 }
 
-func newRSWithStatus(name string, specReplicas, statusReplicas int, selector map[string]string) *exp.ReplicaSet {
+func newRSWithStatus(name string, specReplicas, statusReplicas int, selector map[string]string) *extensions.ReplicaSet {
 	rs := rs(name, specReplicas, selector, noTimestamp)
-	rs.Status = exp.ReplicaSetStatus{
+	rs.Status = extensions.ReplicaSetStatus{
 		Replicas: int32(statusReplicas),
 	}
 	return rs
 }
 
-func deployment(name string, replicas int, maxSurge, maxUnavailable intstr.IntOrString, selector map[string]string) exp.Deployment {
-	return exp.Deployment{
+func newDeployment(name string, replicas int, revisionHistoryLimit *int32, maxSurge, maxUnavailable *intstr.IntOrString, selector map[string]string) *extensions.Deployment {
+	d := extensions.Deployment{
+		TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()},
 		ObjectMeta: api.ObjectMeta{
+			UID:       uuid.NewUUID(),
 			Name:      name,
 			Namespace: api.NamespaceDefault,
 		},
-		Spec: exp.DeploymentSpec{
+		Spec: extensions.DeploymentSpec{
+			Strategy: extensions.DeploymentStrategy{
+				Type:          extensions.RollingUpdateDeploymentStrategyType,
+				RollingUpdate: &extensions.RollingUpdateDeployment{},
+			},
 			Replicas: int32(replicas),
 			Selector: &unversioned.LabelSelector{MatchLabels: selector},
-			Strategy: exp.DeploymentStrategy{
-				Type: exp.RollingUpdateDeploymentStrategyType,
-				RollingUpdate: &exp.RollingUpdateDeployment{
-					MaxSurge:       maxSurge,
-					MaxUnavailable: maxUnavailable,
-				},
-			},
-		},
-	}
-}
-
-func newDeployment(replicas int, revisionHistoryLimit *int) *exp.Deployment {
-	var v *int32
-	if revisionHistoryLimit != nil {
-		v = new(int32)
-		*v = int32(*revisionHistoryLimit)
-	}
-	d := exp.Deployment{
-		TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()},
-		ObjectMeta: api.ObjectMeta{
-			UID:             uuid.NewUUID(),
-			Name:            "foobar",
-			Namespace:       api.NamespaceDefault,
-			ResourceVersion: "18",
-		},
-		Spec: exp.DeploymentSpec{
-			Strategy: exp.DeploymentStrategy{
-				Type:          exp.RollingUpdateDeploymentStrategyType,
-				RollingUpdate: &exp.RollingUpdateDeployment{},
-			},
-			Replicas: int32(replicas),
-			Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
 			Template: api.PodTemplateSpec{
 				ObjectMeta: api.ObjectMeta{
-					Labels: map[string]string{
-						"name": "foo",
-						"type": "production",
-					},
+					Labels: selector,
 				},
 				Spec: api.PodSpec{
 					Containers: []api.Container{
@@ -117,33 +88,32 @@ func newDeployment(replicas int, revisionHistoryLimit *int) *exp.Deployment {
 					},
 				},
 			},
-			RevisionHistoryLimit: v,
+			RevisionHistoryLimit: revisionHistoryLimit,
 		},
 	}
+	if maxSurge != nil {
+		d.Spec.Strategy.RollingUpdate.MaxSurge = *maxSurge
+	}
+	if maxUnavailable != nil {
+		d.Spec.Strategy.RollingUpdate.MaxUnavailable = *maxUnavailable
+	}
 	return &d
 }
 
-// TODO: Consolidate all deployment helpers into one.
-func newDeploymentEnhanced(replicas int, maxSurge intstr.IntOrString) *exp.Deployment {
-	d := newDeployment(replicas, nil)
-	d.Spec.Strategy.RollingUpdate.MaxSurge = maxSurge
-	return d
-}
-
-func newReplicaSet(d *exp.Deployment, name string, replicas int) *exp.ReplicaSet {
-	return &exp.ReplicaSet{
+func newReplicaSet(d *extensions.Deployment, name string, replicas int) *extensions.ReplicaSet {
+	return &extensions.ReplicaSet{
 		ObjectMeta: api.ObjectMeta{
 			Name:      name,
 			Namespace: api.NamespaceDefault,
 		},
-		Spec: exp.ReplicaSetSpec{
+		Spec: extensions.ReplicaSetSpec{
 			Replicas: int32(replicas),
 			Template: d.Spec.Template,
 		},
 	}
 }
 
-func getKey(d *exp.Deployment, t *testing.T) string {
+func getKey(d *extensions.Deployment, t *testing.T) string {
 	if key, err := controller.KeyFunc(d); err != nil {
 		t.Errorf("Unexpected error getting key for deployment %v: %v", d.Name, err)
 		return ""
@@ -157,8 +127,8 @@ type fixture struct {
 
 	client *fake.Clientset
 	// Objects to put in the store.
-	dLister   []*exp.Deployment
-	rsLister  []*exp.ReplicaSet
+	dLister   []*extensions.Deployment
+	rsLister  []*extensions.ReplicaSet
 	podLister []*api.Pod
 
 	// Actions expected to happen on the client. Objects from here are also
@@ -167,21 +137,21 @@ type fixture struct {
 	objects []runtime.Object
 }
 
-func (f *fixture) expectUpdateDeploymentAction(d *exp.Deployment) {
+func (f *fixture) expectUpdateDeploymentAction(d *extensions.Deployment) {
 	f.actions = append(f.actions, core.NewUpdateAction(unversioned.GroupVersionResource{Resource: "deployments"}, d.Namespace, d))
 }
 
-func (f *fixture) expectUpdateDeploymentStatusAction(d *exp.Deployment) {
+func (f *fixture) expectUpdateDeploymentStatusAction(d *extensions.Deployment) {
 	action := core.NewUpdateAction(unversioned.GroupVersionResource{Resource: "deployments"}, d.Namespace, d)
 	action.Subresource = "status"
 	f.actions = append(f.actions, action)
 }
 
-func (f *fixture) expectCreateRSAction(rs *exp.ReplicaSet) {
+func (f *fixture) expectCreateRSAction(rs *extensions.ReplicaSet) {
 	f.actions = append(f.actions, core.NewCreateAction(unversioned.GroupVersionResource{Resource: "replicasets"}, rs.Namespace, rs))
 }
 
-func (f *fixture) expectUpdateRSAction(rs *exp.ReplicaSet) {
+func (f *fixture) expectUpdateRSAction(rs *extensions.ReplicaSet) {
 	f.actions = append(f.actions, core.NewUpdateAction(unversioned.GroupVersionResource{Resource: "replicasets"}, rs.Namespace, rs))
 }
 
@@ -239,7 +209,7 @@ func (f *fixture) run(deploymentName string) {
 func TestSyncDeploymentCreatesReplicaSet(t *testing.T) {
 	f := newFixture(t)
 
-	d := newDeployment(1, nil)
+	d := newDeployment("foo", 1, nil, nil, nil, map[string]string{"foo": "bar"})
 	f.dLister = append(f.dLister, d)
 	f.objects = append(f.objects, d)
 
@@ -255,7 +225,7 @@ func TestSyncDeploymentCreatesReplicaSet(t *testing.T) {
 func TestSyncDeploymentDontDoAnythingDuringDeletion(t *testing.T) {
 	f := newFixture(t)
 
-	d := newDeployment(1, nil)
+	d := newDeployment("foo", 1, nil, nil, nil, map[string]string{"foo": "bar"})
 	now := unversioned.Now()
 	d.DeletionTimestamp = &now
 	f.dLister = append(f.dLister, d)
@@ -272,7 +242,7 @@ func TestDeploymentController_dontSyncDeploymentsWithEmptyPodSelector(t *testing
 	controller.rsListerSynced = alwaysReady
 	controller.podListerSynced = alwaysReady
 
-	d := newDeployment(1, nil)
+	d := newDeployment("foo", 1, nil, nil, nil, map[string]string{"foo": "bar"})
 	empty := unversioned.LabelSelector{}
 	d.Spec.Selector = &empty
 	controller.dLister.Indexer.Add(d)