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

Merge pull request #100056 from pacoxu/patch-6

Browse Source 
[test-only] e2e fix: loosen newTestResourceQuota to 10 configmaps
This commit is contained in:
Kubernetes Prow Robot 2021-03-11 00:18:53 -08:00 committed by GitHub
commit 784df7a37e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/apimachinery/resource_quota.go
View File

@ -335,6 +335,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
ginkgo.By("Creating a ResourceQuota") ginkgo.By("Creating a ResourceQuota")
quotaName := "test-quota" quotaName := "test-quota"
resourceQuota := newTestResourceQuota(quotaName) resourceQuota := newTestResourceQuota(quotaName)
resourceQuota.Spec.Hard[v1.ResourceConfigMaps] = resource.MustParse(hardConfigMaps)
_, err = createResourceQuota(f.ClientSet, f.Namespace.Name, resourceQuota) _, err = createResourceQuota(f.ClientSet, f.Namespace.Name, resourceQuota)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -353,9 +354,6 @@ var _ = SIGDescribe("ResourceQuota", func() {
ginkgo.By("Ensuring resource quota status captures configMap creation") ginkgo.By("Ensuring resource quota status captures configMap creation")
usedResources = v1.ResourceList{} usedResources = v1.ResourceList{}
usedResources[v1.ResourceQuotas] = resource.MustParse(strconv.Itoa(c + 1)) usedResources[v1.ResourceQuotas] = resource.MustParse(strconv.Itoa(c + 1))
// we expect there to be two configmaps because each namespace will receive
// a ca.crt configmap by default.
// ref:https://github.com/kubernetes/kubernetes/pull/68812
usedResources[v1.ResourceConfigMaps] = resource.MustParse(hardConfigMaps) usedResources[v1.ResourceConfigMaps] = resource.MustParse(hardConfigMaps)
err = waitForResourceQuota(f.ClientSet, f.Namespace.Name, quotaName, usedResources) err = waitForResourceQuota(f.ClientSet, f.Namespace.Name, quotaName, usedResources)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -1567,7 +1565,7 @@ func newTestResourceQuota(name string) *v1.ResourceQuota {
hard[v1.ResourceQuotas] = resource.MustParse("1") hard[v1.ResourceQuotas] = resource.MustParse("1")
hard[v1.ResourceCPU] = resource.MustParse("1") hard[v1.ResourceCPU] = resource.MustParse("1")
hard[v1.ResourceMemory] = resource.MustParse("500Mi") hard[v1.ResourceMemory] = resource.MustParse("500Mi")
hard[v1.ResourceConfigMaps] = resource.MustParse("2") hard[v1.ResourceConfigMaps] = resource.MustParse("10")
hard[v1.ResourceSecrets] = resource.MustParse("10") hard[v1.ResourceSecrets] = resource.MustParse("10")
hard[v1.ResourcePersistentVolumeClaims] = resource.MustParse("10") hard[v1.ResourcePersistentVolumeClaims] = resource.MustParse("10")
hard[v1.ResourceRequestsStorage] = resource.MustParse("10Gi") hard[v1.ResourceRequestsStorage] = resource.MustParse("10Gi")