github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #60421 from gmarek/quotas 

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>.

Use quotas in default performance tests

Better to use more features in default tests if possible.

LGTM whenever you think we're ready.

```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2018-03-09 04:39:31 -08:00 committed by GitHub
parent 17d69c296e c3c10208bd
commit b13105d43b
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

@ -197,7 +197,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 {