Skip to content

Commit e8fc79d

Browse files
authored
Merge pull request kubernetes#76644 from ping035627/k8s-190416-2
Delete unused struct, nodeEnumerator
2 parents 0dc281d + a827499 commit e8fc79d

File tree

2 files changed

+0
-44
lines changed

2 files changed

+0
-44
lines changed

pkg/scheduler/factory/factory.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -707,24 +707,6 @@ func MakeDefaultErrorFunc(client clientset.Interface, backoff *internalqueue.Pod
707707
}
708708
}
709709

710-
// nodeEnumerator allows a cache.Poller to enumerate items in a v1.NodeList
711-
type nodeEnumerator struct {
712-
*v1.NodeList
713-
}
714-
715-
// Len returns the number of items in the node list.
716-
func (ne *nodeEnumerator) Len() int {
717-
if ne.NodeList == nil {
718-
return 0
719-
}
720-
return len(ne.Items)
721-
}
722-
723-
// Get returns the item (and ID) with the particular index.
724-
func (ne *nodeEnumerator) Get(index int) interface{} {
725-
return &ne.Items[index]
726-
}
727-
728710
type binder struct {
729711
Client clientset.Interface
730712
}

pkg/scheduler/factory/factory_test.go

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -296,32 +296,6 @@ func TestDefaultErrorFunc(t *testing.T) {
296296
}
297297
}
298298

299-
func TestNodeEnumerator(t *testing.T) {
300-
testList := &v1.NodeList{
301-
Items: []v1.Node{
302-
{ObjectMeta: metav1.ObjectMeta{Name: "foo"}},
303-
{ObjectMeta: metav1.ObjectMeta{Name: "bar"}},
304-
{ObjectMeta: metav1.ObjectMeta{Name: "baz"}},
305-
},
306-
}
307-
me := nodeEnumerator{testList}
308-
309-
if e, a := 3, me.Len(); e != a {
310-
t.Fatalf("expected %v, got %v", e, a)
311-
}
312-
for i := range testList.Items {
313-
t.Run(fmt.Sprintf("node enumerator/%v", i), func(t *testing.T) {
314-
gotObj := me.Get(i)
315-
if e, a := testList.Items[i].Name, gotObj.(*v1.Node).Name; e != a {
316-
t.Errorf("Expected %v, got %v", e, a)
317-
}
318-
if e, a := &testList.Items[i], gotObj; !reflect.DeepEqual(e, a) {
319-
t.Errorf("Expected %#v, got %v#", e, a)
320-
}
321-
})
322-
}
323-
}
324-
325299
func TestBind(t *testing.T) {
326300
table := []struct {
327301
name string

0 commit comments

Comments
 (0)