github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60989 from shyamjvs/disable-quotas-in-scalability-e2es

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Revert "Use quotas in default performance tests"

This reverts commit c3c10208bd.

Ref https://github.com/kubernetes/kubernetes/issues/60988

/cc @gmarek 
/kind bug
/sig scalability
/priority critical-urgent

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-09 11:18:11 -08:00 committed by GitHub
commit 40143fd687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/scalability/density.go
View File

@ -487,7 +487,7 @@ var _ = SIGDescribe("Density", func() {
} }
isCanonical := func(test *Density) bool { isCanonical := func(test *Density) bool {
return test.kind == api.Kind("ReplicationController") && test.daemonsPerNode == 0 && test.secretsPerPod == 0 && test.configMapsPerPod == 0 && test.quotas return test.kind == api.Kind("ReplicationController") && test.daemonsPerNode == 0 && test.secretsPerPod == 0 && test.configMapsPerPod == 0 && !test.quotas
} }
for _, testArg := range densityTests { for _, testArg := range densityTests {

2
test/e2e/scalability/load.go
View File

@ -196,7 +196,7 @@ var _ = SIGDescribe("Load capacity", func() {
} }
isCanonical := func(test *Load) bool { isCanonical := func(test *Load) bool {
return test.podsPerNode == 30 && test.kind == api.Kind("ReplicationController") && test.daemonsPerNode == 0 && test.secretsPerPod == 0 && test.configMapsPerPod == 0 && test.quotas return test.podsPerNode == 30 && test.kind == api.Kind("ReplicationController") && test.daemonsPerNode == 0 && test.secretsPerPod == 0 && test.configMapsPerPod == 0 && !test.quotas
} }
for _, testArg := range loadTests { for _, testArg := range loadTests {