Merge pull request kubernetes-retired#565 from k82cn/up_sched_conf

Removed reclaim&preempt by default.
kevin-wangzefeng · Jan 25, 2019 · fd60624 · fd60624
2 parents 8c383f6 + 3dac0e2
commit fd60624
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/pkg/scheduler/conf/schedConf.go → pkg/scheduler/conf/scheduler_conf.go b/pkg/scheduler/conf/schedConf.go → pkg/scheduler/conf/scheduler_conf.go
diff --git a/pkg/scheduler/util.go b/pkg/scheduler/util.go
@@ -28,7 +28,7 @@ import (
 )
 
 var defaultSchedulerConf = `
-actions: "reclaim, allocate, backfill, preempt"
+actions: "allocate, backfill"
 tiers:
 - plugins:
   - name: priority