github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32877 from deads2k/client-09-fixup-lister

Browse Source 
Automatic merge from submit-queue

change factorization of listers to make them easier to add

`Listers` have a tremendous amount of duplicate code.  This factors that out.

@smarterclayton ptal.
This commit is contained in:
Kubernetes Submit Queue
2016-09-16 22:39:37 -07:00
committed by GitHub
parent 294502685c 1bf17eb4e9
commit cd051703b3
5 changed files with 129 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/controller/daemon/daemoncontroller_test.go
View File

@@ -257,7 +257,7 @@ func TestInsufficentCapacityNodeDaemonDoesNotLaunchPod(t *testing.T) {
node := newNode("too-much-mem", nil)
node.Status.Allocatable = allocatableResources("100M", "200m")
manager.nodeStore.Add(node)
manager.podStore.Add(&api.Pod{
manager.podStore.Indexer.Add(&api.Pod{
Spec: podSpec,
})
ds := newDaemonSet("foo")
@@ -272,7 +272,7 @@ func TestSufficentCapacityWithTerminatedPodsDaemonLaunchesPod(t *testing.T) {
node := newNode("too-much-mem", nil)
node.Status.Allocatable = allocatableResources("100M", "200m")
manager.nodeStore.Add(node)
manager.podStore.Add(&api.Pod{
manager.podStore.Indexer.Add(&api.Pod{
Spec: podSpec,
Status: api.PodStatus{Phase: api.PodSucceeded},
})
@@ -289,7 +289,7 @@ func TestSufficentCapacityNodeDaemonLaunchesPod(t *testing.T) {
node := newNode("not-too-much-mem", nil)
node.Status.Allocatable = allocatableResources("200M", "200m")
manager.nodeStore.Add(node)
manager.podStore.Add(&api.Pod{
manager.podStore.Indexer.Add(&api.Pod{
Spec: podSpec,
})
ds := newDaemonSet("foo")
@@ -305,7 +305,7 @@ func TestDontDoAnythingIfBeingDeleted(t *testing.T) {
node := newNode("not-too-much-mem", nil)
node.Status.Allocatable = allocatableResources("200M", "200m")
manager.nodeStore.Add(node)
manager.podStore.Add(&api.Pod{
manager.podStore.Indexer.Add(&api.Pod{
Spec: podSpec,
})
ds := newDaemonSet("foo")
@@ -329,7 +329,7 @@ func TestPortConflictNodeDaemonDoesNotLaunchPod(t *testing.T) {
manager, podControl := newTestController()
node := newNode("port-conflict", nil)
manager.nodeStore.Add(node)
manager.podStore.Add(&api.Pod{
manager.podStore.Indexer.Add(&api.Pod{
Spec: podSpec,
})
@@ -355,7 +355,7 @@ func TestPortConflictWithSameDaemonPodDoesNotDeletePod(t *testing.T) {
manager, podControl := newTestController()
node := newNode("port-conflict", nil)
manager.nodeStore.Add(node)
manager.podStore.Add(&api.Pod{
manager.podStore.Indexer.Add(&api.Pod{
ObjectMeta: api.ObjectMeta{
Labels: simpleDaemonSetLabel,
Namespace: api.NamespaceDefault,
@@ -389,7 +389,7 @@ func TestNoPortConflictNodeDaemonLaunchesPod(t *testing.T) {
manager, podControl := newTestController()
node := newNode("no-port-conflict", nil)
manager.nodeStore.Add(node)
manager.podStore.Add(&api.Pod{
manager.podStore.Indexer.Add(&api.Pod{
Spec: podSpec1,
})
ds := newDaemonSet("foo")
@@ -405,7 +405,7 @@ func TestPodIsNotDeletedByDaemonsetWithEmptyLabelSelector(t *testing.T) {
manager, podControl := newTestController()
manager.nodeStore.Store.Add(newNode("node1", nil))
// Create pod not controlled by a daemonset.
manager.podStore.Add(&api.Pod{
manager.podStore.Indexer.Add(&api.Pod{
ObjectMeta: api.ObjectMeta{
Labels: map[string]string{"bang": "boom"},
Namespace: api.NamespaceDefault,