github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30764 from gmarek/resource_constraints

Browse Source 
Automatic merge from submit-queue

Fix resource constraint checking in Density test
This commit is contained in:
Kubernetes Submit Queue 2016-08-17 08:32:39 -07:00 committed by GitHub
commit 64e682dcc0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/density.go
View File

@ -395,9 +395,6 @@ var _ = framework.KubeDescribe("Density", func() {
masters, nodes = framework.GetMasterAndWorkerNodesOrDie(c) masters, nodes = framework.GetMasterAndWorkerNodesOrDie(c)
nodeCount = len(nodes.Items) nodeCount = len(nodes.Items)
Expect(nodeCount).NotTo(BeZero()) Expect(nodeCount).NotTo(BeZero())
if nodeCount == 30 {
f.AddonResourceConstraints = func() map[string]framework.ResourceConstraint { return density30AddonResourceVerifier(nodeCount) }()
}
nodeCpuCapacity = nodes.Items[0].Status.Allocatable.Cpu().MilliValue() nodeCpuCapacity = nodes.Items[0].Status.Allocatable.Cpu().MilliValue()
nodeMemCapacity = nodes.Items[0].Status.Allocatable.Memory().Value() nodeMemCapacity = nodes.Items[0].Status.Allocatable.Memory().Value()
@ -450,6 +447,7 @@ var _ = framework.KubeDescribe("Density", func() {
switch testArg.podsPerNode { switch testArg.podsPerNode {
case 30: case 30:
name = "[Feature:Performance] " + name name = "[Feature:Performance] " + name
f.AddonResourceConstraints = func() map[string]framework.ResourceConstraint { return density30AddonResourceVerifier(nodeCount) }()
case 95: case 95:
name = "[Feature:HighDensityPerformance]" + name name = "[Feature:HighDensityPerformance]" + name
default: default: