Merge pull request #30865 from gmarek/constraints

Make sure that provider is set when we create resource constraints in…
This commit is contained in:
Wojciech Tyczynski 2016-08-18 14:14:25 +02:00 committed by GitHub
commit bba4a3beb6

View File

@ -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)