Merge pull request kubernetes#30865 from gmarek/constraints

Make sure that provider is set when we create resource constraints in…
lavalamp · Aug 18, 2016 · bba4a3b · bba4a3b
2 parents 9696a27 + d3d5f88
commit bba4a3b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/test/e2e/density.go b/test/e2e/density.go
@@ -448,7 +448,6 @@ var _ = framework.KubeDescribe("Density", func() {
 		switch testArg.podsPerNode {
 		case 30:
 			name = "[Feature:Performance] " + name
-			f.AddonResourceConstraints = func() map[string]framework.ResourceConstraint { return density30AddonResourceVerifier(nodeCount) }()
 		case 95:
 			name = "[Feature:HighDensityPerformance]" + name
 		default:
@@ -457,6 +456,9 @@ var _ = framework.KubeDescribe("Density", func() {
 		itArg := testArg
 		It(name, func() {
 			podsPerNode := itArg.podsPerNode
+			if podsPerNode == 30 {
+				f.AddonResourceConstraints = func() map[string]framework.ResourceConstraint { return density30AddonResourceVerifier(nodeCount) }()
+			}
 			totalPods = podsPerNode * nodeCount
 			fileHndl, err := os.Create(fmt.Sprintf(framework.TestContext.OutputDir+"/%s/pod_states.csv", uuid))
 			framework.ExpectNoError(err)