skip eviction when pod creation time is below minPodAge threshold setting

README.md

@@ -145,7 +145,7 @@ The Default Evictor Plugin is used by default for filtering pods before processi
 |`priorityThreshold`|`priorityThreshold`||(see [priority filtering](#priority-filtering))|
 |`nodeFit`|`bool`|`false`|(see [node fit filtering](#node-fit-filtering))|
 |`minReplicas`|`uint`|`0`| ignore eviction of pods where owner (e.g. `ReplicaSet`) replicas is below this threshold |
-|`minPodAge`|`uint`|`0`| ignore eviction of pods with a creation time within this threshold (in minutes) |
+|`minPodAge`|`metav1.Duration`|`0`| ignore eviction of pods with a creation time within this threshold (in minutes) |
 
 ### Example policy
 

pkg/api/v1alpha1/conversion.go

@@ -19,7 +19,6 @@ package v1alpha1
 import (
 	"context"
 	"fmt"
-
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/runtime"

pkg/api/v1alpha1/types.go

@@ -55,9 +55,6 @@ type DeschedulerPolicy struct {
 
 	// MaxNoOfPodsToTotal restricts maximum of pods to be evicted total.
 	MaxNoOfPodsToEvictTotal *uint `json:"maxNoOfPodsToEvictTotal,omitempty"`
-
-	// MinPodAge prevents recently created pods (within the specified minutes) from being evicted.
-	MinPodAge *uint `json:"minPodAge,omitempty"`
 }
 
 type (

pkg/framework/plugins/defaultevictor/defaultevictor.go

@@ -186,10 +186,10 @@ func New(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plug
 		})
 	}
 
-	if defaultEvictorArgs.MinPodAge > 0 {
+	if defaultEvictorArgs.MinPodAge != nil {
 		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
-			if pod.Status.StartTime == nil || time.Since(pod.Status.StartTime.Time) < time.Duration(defaultEvictorArgs.MinPodAge)*time.Minute {
-				return fmt.Errorf("pod age is not older than MinPodAge: %d minutes", defaultEvictorArgs.MinPodAge)
+			if pod.Status.StartTime == nil || time.Since(pod.Status.StartTime.Time) < defaultEvictorArgs.MinPodAge.Duration {
+				return fmt.Errorf("pod age is not older than MinPodAge: %d seconds", uint(defaultEvictorArgs.MinPodAge.Duration.Seconds()))
 			}
 			return nil
 		})

pkg/framework/plugins/defaultevictor/defaultevictor_test.go

@@ -44,7 +44,7 @@ type testCase struct {
 	priorityThreshold       *int32
 	nodeFit                 bool
 	minReplicas             uint
-	minPodAge               uint
+	minPodAge               *metav1.Duration
 	result                  bool
 }
 
@@ -329,6 +329,8 @@ func TestDefaultEvictorFilter(t *testing.T) {
 	lowPriority := int32(800)
 	highPriority := int32(900)
 
+	minPodAge := metav1.Duration{50 * time.Minute}
+
 	nodeTaintKey := "hardware"
 	nodeTaintValue := "gpu"
 
@@ -705,15 +707,15 @@ func TestDefaultEvictorFilter(t *testing.T) {
 			minReplicas: 2,
 			result:      true,
 		}, {
-			description: "minPodAge of 50, pod created 1 minute ago, no eviction",
+			description: "minPodAge of 50, pod created 10 minutes ago, no eviction",
 			pods: []*v1.Pod{
 				test.BuildTestPod("p1", 1, 1, n1.Name, func(pod *v1.Pod) {
 					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
-					podStartTime := metav1.Now().Add(time.Minute * time.Duration(-1))
+					podStartTime := metav1.Now().Add(time.Minute * time.Duration(-10))
 					pod.Status.StartTime = &metav1.Time{Time: podStartTime}
 				}),
 			},
-			minPodAge: 50,
+			minPodAge: &minPodAge,
 			result:    false,
 		}, {
 			description: "minPodAge of 50, pod created 60 minutes ago, evicts",
@@ -724,8 +726,18 @@ func TestDefaultEvictorFilter(t *testing.T) {
 					pod.Status.StartTime = &metav1.Time{Time: podStartTime}
 				}),
 			},
-			minPodAge: 50,
+			minPodAge: &minPodAge,
 			result:    true,
+		}, {
+			description: "nil minPodAge, pod created 60 minutes ago, evicts",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p1", 1, 1, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					podStartTime := metav1.Now().Add(time.Minute * time.Duration(-60))
+					pod.Status.StartTime = &metav1.Time{Time: podStartTime}
+				}),
+			},
+			result: true,
 		},
 	}
 

pkg/framework/plugins/defaultevictor/types.go

@@ -35,5 +35,5 @@ type DefaultEvictorArgs struct {
 	PriorityThreshold       *api.PriorityThreshold `json:"priorityThreshold"`
 	NodeFit                 bool                   `json:"nodeFit"`
 	MinReplicas             uint                   `json:"minReplicas"`
-	MinPodAge               uint                   `json:"minPodAge"`
+	MinPodAge               *metav1.Duration       `json:"minPodAge"`
 }