feature: add IgnorePodsWithResourceClaims parameter for configuration

kubernetes-sigs · Jan 7, 2025 · 4c25931 · 4c25931
1 parent 335c698
commit 4c25931
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 46 deletions.
diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go
@@ -57,6 +57,9 @@ type DeschedulerConfiguration struct {
 	// IgnorePVCPods sets whether PVC pods should be allowed to be evicted
 	IgnorePVCPods bool
 
+	// IgnorePodsWithResourceClaims sets whether pods using resource claims should be allowed to be evicted
+	IgnorePodsWithResourceClaims bool
+
 	// Tracing specifies the options for tracing.
 	Tracing TracingConfiguration
 

diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go
@@ -57,6 +57,9 @@ type DeschedulerConfiguration struct {
 	// IgnorePVCPods sets whether PVC pods should be allowed to be evicted
 	IgnorePVCPods bool `json:"ignorePvcPods,omitempty"`
 
+	// IgnorePodsWithResourceClaims sets whether pods using resource claims should be allowed to be evicted
+	IgnorePodsWithResourceClaims bool `json:"ignorePodsWithResourceClaims"`
+
 	// Tracing is used to setup the required OTEL tracing configuration
 	Tracing TracingConfiguration `json:"tracing,omitempty"`
 

diff --git a/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go b/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/descheduler/policyconfig.go b/pkg/descheduler/policyconfig.go
@@ -101,11 +101,12 @@ func setDefaultEvictor(profile api.DeschedulerProfile, client clientset.Interfac
 	newPluginConfig := api.PluginConfig{
 		Name: defaultevictor.PluginName,
 		Args: &defaultevictor.DefaultEvictorArgs{
-			EvictLocalStoragePods:   false,
-			EvictSystemCriticalPods: false,
-			IgnorePvcPods:           false,
-			EvictFailedBarePods:     false,
-			IgnorePodsWithoutPDB:    false,
+			EvictLocalStoragePods:        false,
+			EvictSystemCriticalPods:      false,
+			IgnorePvcPods:                false,
+			EvictFailedBarePods:          false,
+			IgnorePodsWithoutPDB:         false,
+			IgnorePodsWithResourceClaims: false,
 		},
 	}
 

diff --git a/pkg/framework/plugins/defaultevictor/defaultevictor.go b/pkg/framework/plugins/defaultevictor/defaultevictor.go
@@ -209,6 +209,15 @@ func New(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plug
 		})
 	}
 
+	if defaultEvictorArgs.IgnorePodsWithResourceClaims {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			if utils.IsPodWithResourceClaims(pod) {
+				return fmt.Errorf("pod has a ResourceClaim and descheduler is configured to ignore ResourceClaim pods")
+			}
+			return nil
+		})
+	}
+
 	return ev, nil
 }
 

diff --git a/pkg/framework/plugins/defaultevictor/defaultevictor_test.go b/pkg/framework/plugins/defaultevictor/defaultevictor_test.go
@@ -51,6 +51,8 @@ type testCase struct {
 	minPodAge               *metav1.Duration
 	result                  bool
 	ignorePodsWithoutPDB    bool
+	ignorePodsWithResourceClaims bool
+
 }
 
 func TestDefaultEvictorPreEvictionFilter(t *testing.T) {
@@ -895,7 +897,7 @@ func initializePlugin(ctx context.Context, test testCase) (frameworktypes.Plugin
 	defaultEvictorArgs := &DefaultEvictorArgs{
 		EvictLocalStoragePods:   test.evictLocalStoragePods,
 		EvictSystemCriticalPods: test.evictSystemCriticalPods,
-		IgnorePvcPods:           test.ignorePvcPods,
+		IgnorePvcPods:           false,
 		EvictFailedBarePods:     test.evictFailedBarePods,
 		PriorityThreshold: &api.PriorityThreshold{
 			Value: test.priorityThreshold,

diff --git a/pkg/framework/plugins/defaultevictor/defaults.go b/pkg/framework/plugins/defaultevictor/defaults.go
@@ -52,4 +52,10 @@ func SetDefaults_DefaultEvictorArgs(obj runtime.Object) {
 	if !args.NodeFit {
 		args.NodeFit = false
 	}
+	if !args.IgnorePodsWithoutPDB {
+		args.IgnorePodsWithoutPDB = false
+	}
+	if !args.IgnorePodsWithResourceClaims {
+		args.IgnorePodsWithResourceClaims = false
+	}
 }
diff --git a/pkg/framework/plugins/defaultevictor/defaults_test.go b/pkg/framework/plugins/defaultevictor/defaults_test.go
@@ -33,47 +33,50 @@ func TestSetDefaults_DefaultEvictorArgs(t *testing.T) {
 			name: "DefaultEvictorArgs empty",
 			in:   &DefaultEvictorArgs{},
 			want: &DefaultEvictorArgs{
-				NodeSelector:            "",
-				EvictLocalStoragePods:   false,
-				EvictDaemonSetPods:      false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				LabelSelector:           nil,
-				PriorityThreshold:       nil,
-				NodeFit:                 false,
-				IgnorePodsWithoutPDB:    false,
+				NodeSelector:                 "",
+				EvictLocalStoragePods:        false,
+				EvictDaemonSetPods:           false,
+				EvictSystemCriticalPods:      false,
+				IgnorePvcPods:                false,
+				EvictFailedBarePods:          false,
+				LabelSelector:                nil,
+				PriorityThreshold:            nil,
+				NodeFit:                      false,
+				IgnorePodsWithoutPDB:         false,
+				IgnorePodsWithResourceClaims: false,
 			},
 		},
 		{
 			name: "DefaultEvictorArgs with value",
 			in: &DefaultEvictorArgs{
-				NodeSelector:            "NodeSelector",
-				EvictLocalStoragePods:   true,
-				EvictDaemonSetPods:      true,
-				EvictSystemCriticalPods: true,
-				IgnorePvcPods:           true,
-				EvictFailedBarePods:     true,
-				LabelSelector:           nil,
+				NodeSelector:                 "NodeSelector",
+				EvictLocalStoragePods:        true,
+				EvictDaemonSetPods:           true,
+				EvictSystemCriticalPods:      true,
+				IgnorePvcPods:                true,
+				EvictFailedBarePods:          true,
+				LabelSelector:                nil,
+				NodeFit:                      true,
+				IgnorePodsWithoutPDB:         true,
+				IgnorePodsWithResourceClaims: true,
 				PriorityThreshold: &api.PriorityThreshold{
 					Value: utilptr.To[int32](800),
 				},
-				NodeFit:              true,
-				IgnorePodsWithoutPDB: true,
 			},
 			want: &DefaultEvictorArgs{
-				NodeSelector:            "NodeSelector",
-				EvictLocalStoragePods:   true,
-				EvictDaemonSetPods:      true,
-				EvictSystemCriticalPods: true,
-				IgnorePvcPods:           true,
-				EvictFailedBarePods:     true,
-				LabelSelector:           nil,
+				NodeSelector:                 "NodeSelector",
+				EvictLocalStoragePods:        true,
+				EvictDaemonSetPods:           true,
+				EvictSystemCriticalPods:      true,
+				IgnorePvcPods:                true,
+				EvictFailedBarePods:          true,
+				LabelSelector:                nil,
+				NodeFit:                      true,
+				IgnorePodsWithoutPDB:         true,
+				IgnorePodsWithResourceClaims: true,
 				PriorityThreshold: &api.PriorityThreshold{
 					Value: utilptr.To[int32](800),
 				},
-				NodeFit:              true,
-				IgnorePodsWithoutPDB: true,
 			},
 		},
 	}

diff --git a/pkg/framework/plugins/defaultevictor/types.go b/pkg/framework/plugins/defaultevictor/types.go
@@ -25,16 +25,17 @@ import (
 type DefaultEvictorArgs struct {
 	metav1.TypeMeta `json:",inline"`
 
-	NodeSelector            string                 `json:"nodeSelector,omitempty"`
-	EvictLocalStoragePods   bool                   `json:"evictLocalStoragePods,omitempty"`
-	EvictDaemonSetPods      bool                   `json:"evictDaemonSetPods,omitempty"`
-	EvictSystemCriticalPods bool                   `json:"evictSystemCriticalPods,omitempty"`
-	IgnorePvcPods           bool                   `json:"ignorePvcPods,omitempty"`
-	EvictFailedBarePods     bool                   `json:"evictFailedBarePods,omitempty"`
-	LabelSelector           *metav1.LabelSelector  `json:"labelSelector,omitempty"`
-	PriorityThreshold       *api.PriorityThreshold `json:"priorityThreshold,omitempty"`
-	NodeFit                 bool                   `json:"nodeFit,omitempty"`
-	MinReplicas             uint                   `json:"minReplicas,omitempty"`
-	MinPodAge               *metav1.Duration       `json:"minPodAge,omitempty"`
-	IgnorePodsWithoutPDB    bool                   `json:"ignorePodsWithoutPDB,omitempty"`
+	NodeSelector                 string                 `json:"nodeSelector,omitempty"`
+	EvictLocalStoragePods        bool                   `json:"evictLocalStoragePods,omitempty"`
+	EvictDaemonSetPods           bool                   `json:"evictDaemonSetPods,omitempty"`
+	EvictSystemCriticalPods      bool                   `json:"evictSystemCriticalPods,omitempty"`
+	IgnorePvcPods                bool                   `json:"ignorePvcPods,omitempty"`
+	EvictFailedBarePods          bool                   `json:"evictFailedBarePods,omitempty"`
+	LabelSelector                *metav1.LabelSelector  `json:"labelSelector,omitempty"`
+	PriorityThreshold            *api.PriorityThreshold `json:"priorityThreshold,omitempty"`
+	NodeFit                      bool                   `json:"nodeFit,omitempty"`
+	MinReplicas                  uint                   `json:"minReplicas,omitempty"`
+	MinPodAge                    *metav1.Duration       `json:"minPodAge,omitempty"`
+	IgnorePodsWithoutPDB         bool                   `json:"ignorePodsWithoutPDB,omitempty"`
+	IgnorePodsWithResourceClaims bool                   `json:"ignorePodsWithResourceClaims,omitempty"`
 }
diff --git a/pkg/utils/pod.go b/pkg/utils/pod.go
@@ -120,6 +120,14 @@ func IsPodWithPVC(pod *v1.Pod) bool {
 	return false
 }
 
+// IsPodWithResourceClaims returns true if the pod has resource claims.
+func IsPodWithResourceClaims(pod *v1.Pod) bool {
+	if len(pod.Spec.ResourceClaims) != 0 {
+		return true
+	}
+	return false
+}
+
 // IsPodCoveredByPDB returns true if the pod is covered by at least one PodDisruptionBudget.
 func IsPodCoveredByPDB(pod *v1.Pod, lister policyv1.PodDisruptionBudgetLister) (bool, error) {
 	// We can't use the GetPodPodDisruptionBudgets expansion method here because it treats no pdb as an error,