Test that pod matches terms, has label selector

Author: nikimanoledaki

pkg/descheduler/pod/pods_test.go

@@ -229,9 +229,11 @@ func TestGroupByNodeName(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		resultMap := GroupByNodeName(test.pods)
-		if !reflect.DeepEqual(resultMap, test.expMap) {
-			t.Errorf("Expected %v node map, got %v", test.expMap, resultMap)
-		}
+		t.Run(test.name, func(t *testing.T) {
+			resultMap := GroupByNodeName(test.pods)
+			if !reflect.DeepEqual(resultMap, test.expMap) {
+				t.Errorf("Expected %v node map, got %v", test.expMap, resultMap)
+			}
+		})
 	}
 }

pkg/utils/predicates.go

@@ -314,15 +314,15 @@ func CheckPodsWithAntiAffinityExist(pod *v1.Pod, pods map[string][]*v1.Pod, node
 	affinity := pod.Spec.Affinity
 	if affinity != nil && affinity.PodAntiAffinity != nil {
 		for _, term := range getPodAntiAffinityTerms(affinity.PodAntiAffinity) {
-			namespaces := GetNamespacesFromPodAffinityTerm(pod, &term)
+			namespaces := getNamespacesFromPodAffinityTerm(pod, &term)
 			selector, err := metav1.LabelSelectorAsSelector(term.LabelSelector)
 			if err != nil {
 				klog.ErrorS(err, "Unable to convert LabelSelector into Selector")
 				return false
 			}
 			for namespace := range namespaces {
 				for _, existingPod := range pods[namespace] {
-					if existingPod.Name != pod.Name && PodMatchesTermsNamespaceAndSelector(existingPod, namespaces, selector) {
+					if existingPod.Name != pod.Name && podMatchesTermsNamespaceAndSelector(existingPod, namespaces, selector) {
 						node, ok := nodeMap[pod.Spec.NodeName]
 						if !ok {
 							continue
@@ -332,7 +332,7 @@ func CheckPodsWithAntiAffinityExist(pod *v1.Pod, pods map[string][]*v1.Pod, node
 							continue
 						}
 						if hasSameLabelValue(node, nodeHavingExistingPod, term.TopologyKey) {
-							klog.V(1).InfoS("Found Pods violating PodAntiAffinity", "pod to evicted", klog.KObj(pod))
+							klog.V(1).InfoS("Found Pods matching PodAntiAffinity", "pod with anti-affinity", klog.KObj(pod))
 							return true
 						}
 					}

pkg/utils/predicates_test.go

@@ -6,6 +6,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/descheduler/test"
 )
 
 func TestUniqueSortTolerations(t *testing.T) {
@@ -1041,3 +1042,71 @@ func TestPodNodeAffinityWeight(t *testing.T) {
 		})
 	}
 }
+
+func TestCheckPodsWithAntiAffinityExist(t *testing.T) {
+	tests := []struct {
+		name            string
+		pod             *v1.Pod
+		podsInNamespace map[string][]*v1.Pod
+		nodeMap         map[string]*v1.Node
+		affinity        *v1.PodAntiAffinity
+		expMatch        bool
+	}{
+		{
+			name: "found pod matching pod anti-affinity",
+			pod:  test.PodWithPodAntiAffinity(test.BuildTestPod("p1", 1000, 1000, "node", nil), "foo", "bar"),
+			podsInNamespace: map[string][]*v1.Pod{
+				"default": {
+					test.PodWithPodAntiAffinity(test.BuildTestPod("p2", 1000, 1000, "node", nil), "foo", "bar"),
+				},
+			},
+			nodeMap: map[string]*v1.Node{
+				"node": test.BuildTestNode("node", 64000, 128*1000*1000*1000, 2, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						"region": "main-region",
+					}
+				}),
+			},
+			expMatch: true,
+		},
+		{
+			name: "no match with invalid label selector",
+			pod: &v1.Pod{
+				Spec: v1.PodSpec{
+					Affinity: &v1.Affinity{
+						PodAntiAffinity: &v1.PodAntiAffinity{
+							RequiredDuringSchedulingIgnoredDuringExecution: []v1.PodAffinityTerm{
+								{
+									LabelSelector: &metav1.LabelSelector{
+										MatchLabels: map[string]string{
+											"wrong": "selector",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			podsInNamespace: map[string][]*v1.Pod{},
+			nodeMap:         map[string]*v1.Node{},
+			expMatch:        false,
+		},
+		{
+			name: "no match if pod does not match terms namespace",
+			pod: test.PodWithPodAntiAffinity(test.BuildTestPod("p1", 1000, 1000, "node", func(pod *v1.Pod) {
+				pod.Namespace = "other"
+			}), "foo", "bar"),
+			podsInNamespace: map[string][]*v1.Pod{},
+			nodeMap:         map[string]*v1.Node{},
+			expMatch:        false,
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if match := CheckPodsWithAntiAffinityExist(test.pod, test.podsInNamespace, test.nodeMap); match != test.expMatch {
+				t.Errorf("exp %v got %v", test.expMatch, match)
+			}
+		})
+	}
+}

pkg/utils/priority.go

@@ -17,7 +17,7 @@ const SystemCriticalPriority = 2 * int32(1000000000)
 // GetNamespacesFromPodAffinityTerm returns a set of names
 // according to the namespaces indicated in podAffinityTerm.
 // If namespaces is empty it considers the given pod's namespace.
-func GetNamespacesFromPodAffinityTerm(pod *v1.Pod, podAffinityTerm *v1.PodAffinityTerm) sets.Set[string] {
+func getNamespacesFromPodAffinityTerm(pod *v1.Pod, podAffinityTerm *v1.PodAffinityTerm) sets.Set[string] {
 	names := sets.New[string]()
 	if len(podAffinityTerm.Namespaces) == 0 {
 		names.Insert(pod.Namespace)
@@ -27,9 +27,9 @@ func GetNamespacesFromPodAffinityTerm(pod *v1.Pod, podAffinityTerm *v1.PodAffini
 	return names
 }
 
-// PodMatchesTermsNamespaceAndSelector returns true if the given <pod>
+// podMatchesTermsNamespaceAndSelector returns true if the given <pod>
 // matches the namespace and selector defined by <affinityPod>`s <term>.
-func PodMatchesTermsNamespaceAndSelector(pod *v1.Pod, namespaces sets.Set[string], selector labels.Selector) bool {
+func podMatchesTermsNamespaceAndSelector(pod *v1.Pod, namespaces sets.Set[string], selector labels.Selector) bool {
 	if !namespaces.Has(pod.Namespace) {
 		return false
 	}