Moved tests and fixed typs

pkg/controller/daemon/daemoncontroller_test.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apiserver/pkg/storage/names"
 	core "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/cache"
@@ -1008,114 +1007,3 @@ func TestNodeShouldRunDaemonPod(t *testing.T) {
 		}
 	}
 }
-
-func TestDaemonSetUpdatesPods(t *testing.T) {
-	manager, podControl, _ := newTestController()
-	maxUnavailable := 2
-	addNodes(manager.nodeStore, 0, 5, nil)
-	ds := newDaemonSet("foo")
-	manager.dsStore.Add(ds)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
-	markPodsReady(podControl.podStore)
-
-	ds.Spec.Template.Spec.Containers[0].Image = "foo2/bar2"
-	ds.Spec.UpdateStrategy.Type = extensions.RollingUpdateDaemonSetStrategyType
-	intStr := intstr.FromInt(maxUnavailable)
-	ds.Spec.UpdateStrategy.RollingUpdate = &extensions.RollingUpdateDaemonSet{MaxUnavailable: &intStr}
-	ds.Spec.TemplateGeneration++
-	manager.dsStore.Update(ds)
-
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, maxUnavailable)
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, maxUnavailable, 0)
-	markPodsReady(podControl.podStore)
-
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, maxUnavailable)
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, maxUnavailable, 0)
-	markPodsReady(podControl.podStore)
-
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 1)
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 1, 0)
-	markPodsReady(podControl.podStore)
-
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
-	clearExpectations(t, manager, ds, podControl)
-}
-
-func TestDaemonSetUpdatesWhenNewPosIsNotReady(t *testing.T) {
-	manager, podControl, _ := newTestController()
-	maxUnavailable := 3
-	addNodes(manager.nodeStore, 0, 5, nil)
-	ds := newDaemonSet("foo")
-	manager.dsStore.Add(ds)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
-	markPodsReady(podControl.podStore)
-
-	ds.Spec.Template.Spec.Containers[0].Image = "foo2/bar2"
-	ds.Spec.UpdateStrategy.Type = extensions.RollingUpdateDaemonSetStrategyType
-	intStr := intstr.FromInt(maxUnavailable)
-	ds.Spec.UpdateStrategy.RollingUpdate = &extensions.RollingUpdateDaemonSet{MaxUnavailable: &intStr}
-	ds.Spec.TemplateGeneration++
-	manager.dsStore.Update(ds)
-
-	// new pods are not ready numUnavailable == maxUnavailable
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, maxUnavailable)
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, maxUnavailable, 0)
-
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
-	clearExpectations(t, manager, ds, podControl)
-}
-
-func TestDaemonSetUpdatesAllOldPodsNotReady(t *testing.T) {
-	manager, podControl, _ := newTestController()
-	maxUnavailable := 3
-	addNodes(manager.nodeStore, 0, 5, nil)
-	ds := newDaemonSet("foo")
-	manager.dsStore.Add(ds)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
-
-	ds.Spec.Template.Spec.Containers[0].Image = "foo2/bar2"
-	ds.Spec.UpdateStrategy.Type = extensions.RollingUpdateDaemonSetStrategyType
-	intStr := intstr.FromInt(maxUnavailable)
-	ds.Spec.UpdateStrategy.RollingUpdate = &extensions.RollingUpdateDaemonSet{MaxUnavailable: &intStr}
-	ds.Spec.TemplateGeneration++
-	manager.dsStore.Update(ds)
-
-	// all old pods are unavailable so should be removed
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 5)
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
-
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
-	clearExpectations(t, manager, ds, podControl)
-}
-
-func TestDaemonSetUpdatesNoTemplateChanged(t *testing.T) {
-	manager, podControl, _ := newTestController()
-	maxUnavailable := 3
-	addNodes(manager.nodeStore, 0, 5, nil)
-	ds := newDaemonSet("foo")
-	manager.dsStore.Add(ds)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
-
-	ds.Spec.UpdateStrategy.Type = extensions.RollingUpdateDaemonSetStrategyType
-	intStr := intstr.FromInt(maxUnavailable)
-	ds.Spec.UpdateStrategy.RollingUpdate = &extensions.RollingUpdateDaemonSet{MaxUnavailable: &intStr}
-	manager.dsStore.Update(ds)
-
-	// template is not changed no pod should be removed
-	clearExpectations(t, manager, ds, podControl)
-	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
-	clearExpectations(t, manager, ds, podControl)
-}

pkg/controller/daemon/update_test.go

@@ -19,17 +19,117 @@ package daemon
 import (
 	"testing"
 
+	"k8s.io/apimachinery/pkg/util/intstr"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
-// DaemonSets without node selectors should launch pods on every node.
-func TestSimpleDaemonSetUpdatesWithRollingUpdate(t *testing.T) {
+func TestDaemonSetUpdatesPods(t *testing.T) {
 	manager, podControl, _ := newTestController()
+	maxUnavailable := 2
 	addNodes(manager.nodeStore, 0, 5, nil)
 	ds := newDaemonSet("foo")
 	manager.dsStore.Add(ds)
 	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
+	markPodsReady(podControl.podStore)
+
+	ds.Spec.Template.Spec.Containers[0].Image = "foo2/bar2"
+	ds.Spec.UpdateStrategy.Type = extensions.RollingUpdateDaemonSetStrategyType
+	intStr := intstr.FromInt(maxUnavailable)
+	ds.Spec.UpdateStrategy.RollingUpdate = &extensions.RollingUpdateDaemonSet{MaxUnavailable: &intStr}
+	ds.Spec.TemplateGeneration++
+	manager.dsStore.Update(ds)
+
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, maxUnavailable)
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, maxUnavailable, 0)
+	markPodsReady(podControl.podStore)
+
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, maxUnavailable)
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, maxUnavailable, 0)
+	markPodsReady(podControl.podStore)
+
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 1)
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 1, 0)
+	markPodsReady(podControl.podStore)
+
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
+	clearExpectations(t, manager, ds, podControl)
+}
+
+func TestDaemonSetUpdatesWhenNewPosIsNotReady(t *testing.T) {
+	manager, podControl, _ := newTestController()
+	maxUnavailable := 3
+	addNodes(manager.nodeStore, 0, 5, nil)
+	ds := newDaemonSet("foo")
+	manager.dsStore.Add(ds)
 	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
-	// change strategy type to RollingUpdate
+	markPodsReady(podControl.podStore)
+
+	ds.Spec.Template.Spec.Containers[0].Image = "foo2/bar2"
 	ds.Spec.UpdateStrategy.Type = extensions.RollingUpdateDaemonSetStrategyType
+	intStr := intstr.FromInt(maxUnavailable)
+	ds.Spec.UpdateStrategy.RollingUpdate = &extensions.RollingUpdateDaemonSet{MaxUnavailable: &intStr}
+	ds.Spec.TemplateGeneration++
+	manager.dsStore.Update(ds)
+
+	// new pods are not ready numUnavailable == maxUnavailable
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, maxUnavailable)
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, maxUnavailable, 0)
+
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
+	clearExpectations(t, manager, ds, podControl)
+}
+
+func TestDaemonSetUpdatesAllOldPodsNotReady(t *testing.T) {
+	manager, podControl, _ := newTestController()
+	maxUnavailable := 3
+	addNodes(manager.nodeStore, 0, 5, nil)
+	ds := newDaemonSet("foo")
+	manager.dsStore.Add(ds)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
+
+	ds.Spec.Template.Spec.Containers[0].Image = "foo2/bar2"
+	ds.Spec.UpdateStrategy.Type = extensions.RollingUpdateDaemonSetStrategyType
+	intStr := intstr.FromInt(maxUnavailable)
+	ds.Spec.UpdateStrategy.RollingUpdate = &extensions.RollingUpdateDaemonSet{MaxUnavailable: &intStr}
+	ds.Spec.TemplateGeneration++
+	manager.dsStore.Update(ds)
+
+	// all old pods are unavailable so should be removed
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 5)
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
+
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
+	clearExpectations(t, manager, ds, podControl)
+}
+
+func TestDaemonSetUpdatesNoTemplateChanged(t *testing.T) {
+	manager, podControl, _ := newTestController()
+	maxUnavailable := 3
+	addNodes(manager.nodeStore, 0, 5, nil)
+	ds := newDaemonSet("foo")
+	manager.dsStore.Add(ds)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 5, 0)
+
+	ds.Spec.UpdateStrategy.Type = extensions.RollingUpdateDaemonSetStrategyType
+	intStr := intstr.FromInt(maxUnavailable)
+	ds.Spec.UpdateStrategy.RollingUpdate = &extensions.RollingUpdateDaemonSet{MaxUnavailable: &intStr}
+	manager.dsStore.Update(ds)
+
+	// template is not changed no pod should be removed
+	clearExpectations(t, manager, ds, podControl)
+	syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0)
+	clearExpectations(t, manager, ds, podControl)
 }

pkg/controller/daemon/util/daemonset_util_test.go

@@ -67,6 +67,11 @@ func TestIsPodUpdated(t *testing.T) {
 			newPod("pod1", "node1", map[string]string{}),
 			false,
 		},
+		{
+			int64(12355),
+			newPod("pod1", "node1", nil),
+			false,
+		},
 	}
 	for _, test := range tests {
 		updated := IsPodUpdated(test.templateGeneration, test.pod)
@@ -76,12 +81,12 @@ func TestIsPodUpdated(t *testing.T) {
 	}
 }
 
-func TestGetPodTemplateWithRevision(t *testing.T) {
+func TestGetPodTemplateWithGeneration(t *testing.T) {
 	generation := int64(1)
 	podTemplateSpec := v1.PodTemplateSpec{}
 	newPodTemplate := GetPodTemplateWithGeneration(podTemplateSpec, generation)
 	label, exists := newPodTemplate.ObjectMeta.Labels[extensions.DaemonSetTemplateGenerationKey]
 	if !exists || label != fmt.Sprint(generation) {
-		t.Errorf("Error in getting podTemplateSpec with label geneartion. Exists: %t, label: %s", exists, label)
+		t.Errorf("Error in getting podTemplateSpec with label generation. Exists: %t, label: %s", exists, label)
 	}
 }

pkg/kubectl/rollout_status.go

@@ -86,7 +86,7 @@ func (s *DeploymentStatusViewer) Status(namespace, name string, revision int64)
 
 // Status returns a message describing daemon set status, and a bool value indicating if the status is considered done
 func (s *DaemonSetStatusViewer) Status(namespace, name string, revision int64) (string, bool, error) {
-	//ignoring revision as DaemonSets do not have history yet
+	//ignoring revision as DaemonSets does not have history yet
 
 	daemon, err := s.c.DaemonSets(namespace).Get(name, metav1.GetOptions{})
 	if err != nil {