Support of the namespaceLabelSelector in DefaultEvictor plugin

kubernetes-sigs · Sep 4, 2024 · 056805f · 056805f
1 parent 757c6df
commit 056805f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/pkg/framework/plugins/defaultevictor/defaultevictor.go b/pkg/framework/plugins/defaultevictor/defaultevictor.go
@@ -19,7 +19,6 @@ import (
 	"errors"
 	"fmt"
 	"time"
-	"strings"
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/framework/plugins/defaultevictor/defaultevictor_test.go b/pkg/framework/plugins/defaultevictor/defaultevictor_test.go
@@ -15,7 +15,9 @@ package defaultevictor
 
 import (
 	"context"
+	"fmt"
 	"testing"
+	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -49,6 +51,13 @@ type testCase struct {
 	result                  bool
 }
 
+var namespace = "test"
+var namespaceSelector = &metav1.LabelSelector{
+	MatchLabels: map[string]string{
+		"kubernetes.io/metadata.name": namespace,
+	},
+}
+
 func TestDefaultEvictorPreEvictionFilter(t *testing.T) {
 	n1 := test.BuildTestNode("node1", 1000, 2000, 13, nil)
 
@@ -58,13 +67,6 @@ func TestDefaultEvictorPreEvictionFilter(t *testing.T) {
 	nodeLabelKey := "datacenter"
 	nodeLabelValue := "east"
 
-	namespace := "test"
-	namespaceSelector := &metav1.LabelSelector{
-		MatchLabels: map[string]string{
-			"kubernetes.io/metadata.name": namespace,
-		},
-	}
-
 	testCases := []testCase{
 		{
 			description: "Pod with no tolerations running on normal node, all other nodes tainted",