github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29205 from intelsdi-x/limit_number_of_pods_in_resource_limit_test

Browse Source 
Automatic merge from submit-queue

Limit number of pods spawned in SchedulerPredicates validates resourc…

Fixes https://github.com/kubernetes/kubernetes/issues/29190,
With this patch test should spawn at most 10 pods on the smallest node.
This commit is contained in:
Kubernetes Submit Queue 2016-08-03 15:08:20 -07:00 committed by GitHub
commit 2301ab7e0e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/scheduler_predicates.go
View File

@ -35,6 +35,9 @@ import (
_ "github.com/stretchr/testify/assert" _ "github.com/stretchr/testify/assert"
) )
const maxNumberOfPods int64 = 10
const minPodCPURequest int64 = 500
// variable set in BeforeEach, never modified afterwards // variable set in BeforeEach, never modified afterwards
var masterNodes sets.String var masterNodes sets.String
@ -262,11 +265,16 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
// It assumes that cluster add-on pods stay stable and cannot be run in parallel with any other test that touches Nodes or Pods. // It assumes that cluster add-on pods stay stable and cannot be run in parallel with any other test that touches Nodes or Pods.
// It is so because we need to have precise control on what's running in the cluster. // It is so because we need to have precise control on what's running in the cluster.
It("validates resource limits of pods that are allowed to run [Conformance]", func() { It("validates resource limits of pods that are allowed to run [Conformance]", func() {
nodeMaxCapacity := int64(0)
nodeToCapacityMap := make(map[string]int64) nodeToCapacityMap := make(map[string]int64)
for _, node := range nodeList.Items { for _, node := range nodeList.Items {
capacity, found := node.Status.Capacity["cpu"] capacity, found := node.Status.Capacity["cpu"]
Expect(found).To(Equal(true)) Expect(found).To(Equal(true))
nodeToCapacityMap[node.Name] = capacity.MilliValue() nodeToCapacityMap[node.Name] = capacity.MilliValue()
if nodeMaxCapacity < capacity.MilliValue() {
nodeMaxCapacity = capacity.MilliValue()
}
} }
waitForStableCluster(c) waitForStableCluster(c)
@ -281,7 +289,12 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
} }
var podsNeededForSaturation int var podsNeededForSaturation int
milliCpuPerPod := int64(500)
milliCpuPerPod := nodeMaxCapacity / maxNumberOfPods
if milliCpuPerPod < minPodCPURequest {
milliCpuPerPod = minPodCPURequest
}
framework.Logf("Using pod capacity: %vm", milliCpuPerPod)
for name, leftCapacity := range nodeToCapacityMap { for name, leftCapacity := range nodeToCapacityMap {
framework.Logf("Node: %v has cpu capacity: %vm", name, leftCapacity) framework.Logf("Node: %v has cpu capacity: %vm", name, leftCapacity)
podsNeededForSaturation += (int)(leftCapacity / milliCpuPerPod) podsNeededForSaturation += (int)(leftCapacity / milliCpuPerPod)