Merge pull request #642 from tiraboschi/noEvictionPolicy

[RelieveAndMigrate] configure Mandatory noEvictionPolicy

Author: openshift-merge-bot[bot]

README.md

@@ -211,6 +211,8 @@ By default, this profile configures the descheduler to restrict the maximum numb
 the maximum number of evictions per node to 2 aligning with KubeVirt defaults around concurrent live migrations.
 Those two values can be customized with `evictionLimits.total` and `evictionLimits.node` parameters.
 
+This profile configures the `DefaultEvictor` plugin with a `Mandatory noEvictionPolicy`. As a result, the `descheduler.alpha.kubernetes.io/prefer-no-eviction` annotation can be dynamically applied to VM templates and/or VMIs to exclude them from the descheduler's scope.
+
 ### EvictPodsWithPVC
 By default, the operator prevents pods with PVCs from being evicted. Enabling this
 profile in combination with any of the above profiles allows pods with PVCs to be

go.mod

@@ -26,7 +26,7 @@ require (
 	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
 	sigs.k8s.io/controller-runtime v0.20.4
 	sigs.k8s.io/controller-tools v0.17.3
-	sigs.k8s.io/descheduler v0.33.1-0.20250504164356-5ce857b3fd0a
+	sigs.k8s.io/descheduler v0.33.1-0.20250731121316-419fe74702df
 	sigs.k8s.io/structured-merge-diff/v4 v4.6.0
 )
 

go.sum

@@ -385,8 +385,8 @@ sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+
 sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
 sigs.k8s.io/controller-tools v0.17.3 h1:lwFPLicpBKLgIepah+c8ikRBubFW5kOQyT88r3EwfNw=
 sigs.k8s.io/controller-tools v0.17.3/go.mod h1:1ii+oXcYZkxcBXzwv3YZBlzjt1fvkrCGjVF73blosJI=
-sigs.k8s.io/descheduler v0.33.1-0.20250504164356-5ce857b3fd0a h1:V9lnfHV189jjWC489eu5zB3ONvJPoUI3LurpHqE1NfE=
-sigs.k8s.io/descheduler v0.33.1-0.20250504164356-5ce857b3fd0a/go.mod h1:rziKLwEllK+dLu0W5VEBURvv9xhl1y111eEiYGMMsII=
+sigs.k8s.io/descheduler v0.33.1-0.20250731121316-419fe74702df h1:H0bBlA2wcWdM5PCrwAkJdyJNM+fmdjuMsJv4s3Aio/U=
+sigs.k8s.io/descheduler v0.33.1-0.20250731121316-419fe74702df/go.mod h1:rziKLwEllK+dLu0W5VEBURvv9xhl1y111eEiYGMMsII=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 h1:PFWFSkpArPNJxFX4ZKWAk9NSeRoZaXschn+ULa4xVek=

pkg/operator/target_config_reconciler.go

@@ -1065,6 +1065,7 @@ func relieveAndMigrateProfile(profileCustomizations *deschedulerv1.ProfileCustom
 					Object: &defaultevictor.DefaultEvictorArgs{
 						IgnorePvcPods:         false, // evict pvc pods by default
 						EvictLocalStoragePods: true,  // evict pods with local storage by default
+						NoEvictionPolicy:      defaultevictor.MandatoryNoEvictionPolicy,
 					},
 				},
 			},

pkg/operator/testdata/assets/relieveAndMigrateDefaults.yaml

@@ -30,6 +30,7 @@ profiles:
     name: LowNodeUtilization
   - args:
       evictLocalStoragePods: true
+      noEvictionPolicy: Mandatory
     name: DefaultEvictor
   plugins:
     balance:

pkg/operator/testdata/assets/relieveAndMigrateDeviationLowWithCombinedMetrics.yaml

@@ -30,6 +30,7 @@ profiles:
     name: LowNodeUtilization
   - args:
       evictLocalStoragePods: true
+      noEvictionPolicy: Mandatory
     name: DefaultEvictor
   plugins:
     balance:

pkg/operator/testdata/assets/relieveAndMigrateDynamicThresholdsHigh.yaml

@@ -30,6 +30,7 @@ profiles:
     name: LowNodeUtilization
   - args:
       evictLocalStoragePods: true
+      noEvictionPolicy: Mandatory
     name: DefaultEvictor
   plugins:
     balance:

pkg/operator/testdata/assets/relieveAndMigrateDynamicThresholdsLow.yaml

@@ -30,6 +30,7 @@ profiles:
     name: LowNodeUtilization
   - args:
       evictLocalStoragePods: true
+      noEvictionPolicy: Mandatory
     name: DefaultEvictor
   plugins:
     balance:

pkg/operator/testdata/assets/relieveAndMigrateDynamicThresholdsMedium.yaml

@@ -30,6 +30,7 @@ profiles:
     name: LowNodeUtilization
   - args:
       evictLocalStoragePods: true
+      noEvictionPolicy: Mandatory
     name: DefaultEvictor
   plugins:
     balance:

pkg/operator/testdata/assets/relieveAndMigrateEvictionLimits.yaml

@@ -30,6 +30,7 @@ profiles:
     name: LowNodeUtilization
   - args:
       evictLocalStoragePods: true
+      noEvictionPolicy: Mandatory
     name: DefaultEvictor
   plugins:
     balance: