Take default limits for cpu and mem into account in FitPredicate

2015-10-09 16:32:45 +01:00
parent 49a5f89921
commit aea7985b85
4 changed files with 63 additions and 51 deletions
--- a/contrib/mesos/pkg/scheduler/plugin_test.go
+++ b/contrib/mesos/pkg/scheduler/plugin_test.go
@@ -450,7 +450,10 @@ func newLifecycleTest(t *testing.T) lifecycleTest {

 	// create scheduler
 	strategy := NewAllocationStrategy(
-		podtask.DefaultPredicate,
+		podtask.NewDefaultPredicate(
+			mresource.DefaultDefaultContainerCPULimit,
+			mresource.DefaultDefaultContainerMemLimit,
+		),
 		podtask.NewDefaultProcurement(
 			mresource.DefaultDefaultContainerCPULimit,
 			mresource.DefaultDefaultContainerMemLimit,