Merge pull request #1022 from JulyWindK/dev/kfx-fix-nil-point

fix(qrm): fix the null pointer issue in deletionOptions

Author: luomingmeng

pkg/agent/evictionmanager/eviction_resp_collector.go

@@ -191,16 +191,17 @@ func (e *evictionRespCollector) collectTopEvictionPods(dryRunPlugins []string, p
 
 	for _, pod := range targetPods {
 		deletionOptions := resp.DeletionOptions
+		if deletionOptions == nil {
+			deletionOptions = &pluginapi.DeletionOptions{}
+		}
 		reason := fmt.Sprintf("plugin %s met threshold in scope %s, target %v, observed %v",
 			pluginName, threshold.EvictionScope, threshold.ThresholdValue, threshold.ObservedValue)
 
 		forceEvictPod := e.getForceEvictPods()[string(pod.UID)]
 		if forceEvictPod != nil && forceEvictPod.EvictPod != nil {
-			if deletionOptions != nil && forceEvictPod.EvictPod.DeletionOptions != nil {
+			if forceEvictPod.EvictPod.DeletionOptions != nil {
 				deletionOptions.GracePeriodSeconds = general.MaxInt64(deletionOptions.GracePeriodSeconds,
 					forceEvictPod.EvictPod.DeletionOptions.GracePeriodSeconds)
-			} else if forceEvictPod.EvictPod.DeletionOptions != nil {
-				deletionOptions.GracePeriodSeconds = forceEvictPod.EvictPod.DeletionOptions.GracePeriodSeconds
 			}
 			reason = fmt.Sprintf("%s; %s", reason, forceEvictPod.EvictPod.Reason)
 		}