Fix issue with node that has no non-DS pods not getting deleted

k8s/util.go

@@ -6,10 +6,6 @@ import (
 )
 
 func CheckIfNodeHasEnoughResourcesToTransferAllPodsInNodes(kubernetesClient KubernetesClientApi, oldNode *v1.Node, targetNodes []*v1.Node) bool {
-	// If there's no target nodes, then there's definitely not enough resources available
-	if len(targetNodes) == 0 {
-		return false
-	}
 	totalAvailableTargetCpu := int64(0)
 	totalAvailableTargetMemory := int64(0)
 	// Get resources available in target nodes
@@ -69,7 +65,7 @@ func CheckIfNodeHasEnoughResourcesToTransferAllPodsInNodes(kubernetesClient Kube
 	}
 	leftOverCpu := totalAvailableTargetCpu - cpuNeeded
 	leftOverMemory := totalAvailableTargetMemory - memoryNeeded
-	return leftOverCpu > 0 && leftOverMemory > 0
+	return leftOverCpu >= 0 && leftOverMemory >= 0
 }
 
 func AnnotateNodeByHostName(kubernetesClient KubernetesClientApi, hostName, key, value string) error {

k8s/util_test.go

@@ -106,7 +106,15 @@ func TestCheckIfNodeHasEnoughResourcesToTransferAllPodsInNodes_withNoTargetNodes
 	if hasEnoughResources {
 		t.Error("there's no target nodes; there definitely shouldn't have been enough space")
 	}
-	if mockKubernetesClient.Counter["GetPodsInNode"] != 0 {
-		t.Error("GetPodInNode shouldn't have been called")
+}
+
+func TestCheckIfNodeHasEnoughResourcesToTransferAllPodsInNodes_withNoTargetNodesButOldNodeOnlyHasPodsFromDaemonSets(t *testing.T) {
+	oldNode := k8stest.CreateTestNode("old-node", "0m", "0m")
+	oldNodePod := k8stest.CreateTestPod("old-node-pod-1", oldNode.Name, "500Mi", "500Mi", true)
+	mockKubernetesClient := k8stest.NewMockKubernetesClient([]v1.Node{oldNode}, []v1.Pod{oldNodePod})
+
+	hasEnoughResources := CheckIfNodeHasEnoughResourcesToTransferAllPodsInNodes(mockKubernetesClient, &oldNode, []*v1.Node{})
+	if !hasEnoughResources {
+		t.Error("there's no target nodes, but the only pods in the old node are from daemon sets")
 	}
 }