kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deflake OOM tests 

They pass but are a little flaky because they time out about on about 10% of the runs.
The test seems to fail most ofteen with K8s 1.14 but also times out on other versions.

Minor code clean ups (move out a const, break up a long line).
This commit is contained in:
Joachim Bartosik 2020-04-03 13:10:29 +02:00
parent 9385626537
commit a444c15dd0
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vertical-pod-autoscaler/e2e/v1/full_vpa.go
View File

@ -39,8 +39,9 @@ const (
minimalMemoryLowerBound = "20Mi"
minimalMemoryUpperBound = "300Mi"
// the initial values should be outside minimal bounds
initialCPU = int64(10) // mCPU
initialMemory = int64(10) // MB
initialCPU = int64(10) // mCPU
initialMemory = int64(10) // MB
oomTestTimeout = 8 * time.Minute
)
var _ = FullVpaE2eDescribe("Pods under VPA", func() {
@ -156,9 +157,12 @@ var _ = FullVpaE2eDescribe("OOMing pods under VPA", func() {
})
ginkgo.It("have memory requests growing with OOMs", func() {
listOptions := metav1.ListOptions{LabelSelector: "name=hamster", FieldSelector: getPodSelectorExcludingDonePodsOrDie()}
listOptions := metav1.ListOptions{
LabelSelector: "name=hamster",
FieldSelector: getPodSelectorExcludingDonePodsOrDie(),
}
err := waitForResourceRequestInRangeInPods(
f, 7*time.Minute, listOptions, apiv1.ResourceMemory,
f, oomTestTimeout, listOptions, apiv1.ResourceMemory,
ParseQuantityOrDie("1400Mi"), ParseQuantityOrDie("10000Mi"))
gomega.Expect(err).NotTo(gomega.HaveOccurred())
})

12
vertical-pod-autoscaler/e2e/v1beta2/full_vpa.go
View File

@ -39,8 +39,9 @@ const (
minimalMemoryLowerBound = "20Mi"
minimalMemoryUpperBound = "300Mi"
// the initial values should be outside minimal bounds
initialCPU = int64(10) // mCPU
initialMemory = int64(10) // MB
initialCPU = int64(10) // mCPU
initialMemory = int64(10) // MB
oomTestTimeout = 8 * time.Minute
)
var _ = FullVpaE2eDescribe("Pods under VPA", func() {
@ -156,9 +157,12 @@ var _ = FullVpaE2eDescribe("OOMing pods under VPA", func() {
})
ginkgo.It("have memory requests growing with OOMs", func() {
listOptions := metav1.ListOptions{LabelSelector: "name=hamster", FieldSelector: getPodSelectorExcludingDonePodsOrDie()}
listOptions := metav1.ListOptions{
LabelSelector: "name=hamster",
FieldSelector: getPodSelectorExcludingDonePodsOrDie(),
}
err := waitForResourceRequestInRangeInPods(
f, 7*time.Minute, listOptions, apiv1.ResourceMemory,
f, oomTestTimeout, listOptions, apiv1.ResourceMemory,
ParseQuantityOrDie("1400Mi"), ParseQuantityOrDie("10000Mi"))
gomega.Expect(err).NotTo(gomega.HaveOccurred())
})