NewPodEvictor: drop nodes parameter

pkg/descheduler/descheduler.go

@@ -160,7 +160,6 @@ func (d *descheduler) runDeschedulerLoop(ctx context.Context, nodes []*v1.Node)
 		d.rs.DryRun,
 		d.deschedulerPolicy.MaxNoOfPodsToEvictPerNode,
 		d.deschedulerPolicy.MaxNoOfPodsToEvictPerNamespace,
-		nodes,
 		!d.rs.DisableMetrics,
 		d.eventRecorder,
 	)

pkg/descheduler/evictions/evictions.go

@@ -43,7 +43,6 @@ type (
 
 type PodEvictor struct {
 	client                     clientset.Interface
-	nodes                      []*v1.Node
 	policyGroupVersion         string
 	dryRun                     bool
 	maxPodsToEvictPerNode      *uint
@@ -60,26 +59,17 @@ func NewPodEvictor(
 	dryRun bool,
 	maxPodsToEvictPerNode *uint,
 	maxPodsToEvictPerNamespace *uint,
-	nodes []*v1.Node,
 	metricsEnabled bool,
 	eventRecorder events.EventRecorder,
 ) *PodEvictor {
-	nodePodCount := make(nodePodEvictedCount)
-	namespacePodCount := make(namespacePodEvictCount)
-	for _, node := range nodes {
-		// Initialize podsEvicted till now with 0.
-		nodePodCount[node.Name] = 0
-	}
-
 	return &PodEvictor{
 		client:                     client,
-		nodes:                      nodes,
 		policyGroupVersion:         policyGroupVersion,
 		dryRun:                     dryRun,
 		maxPodsToEvictPerNode:      maxPodsToEvictPerNode,
 		maxPodsToEvictPerNamespace: maxPodsToEvictPerNamespace,
-		nodepodCount:               nodePodCount,
-		namespacePodCount:          namespacePodCount,
+		nodepodCount:               make(nodePodEvictedCount),
+		namespacePodCount:          make(namespacePodEvictCount),
 		metricsEnabled:             metricsEnabled,
 		eventRecorder:              eventRecorder,
 	}

pkg/descheduler/evictions/evictions_test.go

@@ -22,9 +22,12 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
+	"k8s.io/client-go/tools/events"
+	utilpointer "k8s.io/utils/pointer"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	"sigs.k8s.io/descheduler/pkg/utils"
 	"sigs.k8s.io/descheduler/test"
@@ -113,3 +116,52 @@ func TestPodTypes(t *testing.T) {
 		t.Errorf("Expected p1 to be a normal pod.")
 	}
 }
+
+func TestNewPodEvictor(t *testing.T) {
+	pod1 := test.BuildTestPod("pod", 400, 0, "node", nil)
+
+	fakeClient := fake.NewSimpleClientset(pod1)
+
+	eventRecorder := &events.FakeRecorder{}
+
+	podEvictor := NewPodEvictor(
+		fakeClient,
+		"policy/v1",
+		false,
+		utilpointer.Uint(1),
+		nil,
+		false,
+		eventRecorder,
+	)
+
+	stubNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node"}}
+
+	// 0 evictions expected
+	if evictions := podEvictor.NodeEvicted(stubNode); evictions != 0 {
+		t.Errorf("Expected 0 node evictions, got %q instead", evictions)
+	}
+	// 0 evictions expected
+	if evictions := podEvictor.TotalEvicted(); evictions != 0 {
+		t.Errorf("Expected 0 total evictions, got %q instead", evictions)
+	}
+
+	if podEvictor.NodeLimitExceeded(stubNode) {
+		t.Errorf("Expected NodeLimitExceeded to return false, got true instead")
+	}
+
+	if !podEvictor.EvictPod(context.TODO(), pod1, EvictOptions{}) {
+		t.Errorf("Expected a pod eviction, got no eviction instead")
+	}
+
+	// 1 node eviction expected
+	if evictions := podEvictor.NodeEvicted(stubNode); evictions != 1 {
+		t.Errorf("Expected 1 node eviction, got %q instead", evictions)
+	}
+	// 1 total eviction expected
+	if evictions := podEvictor.TotalEvicted(); evictions != 1 {
+		t.Errorf("Expected 1 total evictions, got %q instead", evictions)
+	}
+	if !podEvictor.NodeLimitExceeded(stubNode) {
+		t.Errorf("Expected NodeLimitExceeded to return true, got false instead")
+	}
+}