8000 e2e fix: loosen configmap to 10 in resource quota · openshift/kubernetes@a660f5c · GitHub
[go: up one dir, main page]

Skip to content

Commit a660f5c

Browse files
committed
e2e fix: loosen configmap to 10 in resource quota
1 parent f2fe40c commit a660f5c

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

test/e2e/apimachinery/resource_quota.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
320320
ginkgo.By("Creating a ResourceQuota")
321321
quotaName := "test-quota"
322322
resourceQuota := newTestResourceQuota(quotaName)
323+
resourceQuota.Spec.Hard[v1.ResourceConfigMaps] = resource.MustParse(hardConfigMaps)
323324
_, err = createResourceQuota(f.ClientSet, f.Namespace.Name, resourceQuota)
324325
framework.ExpectNoError(err)
325326

@@ -338,9 +339,6 @@ var _ = SIGDescribe("ResourceQuota", func() {
338339
ginkgo.By("Ensuring resource quota status captures configMap creation")
339340
usedResources = v1.ResourceList{}
340341
usedResources[v1.ResourceQuotas] = resource.MustParse(strconv.Itoa(c + 1))
341-
// we expect there to be two configmaps because each namespace will receive
342-
// a ca.crt configmap by default.
343-
// ref:https://github.com/kubernetes/kubernetes/pull/68812
344342
usedResources[v1.ResourceConfigMaps] = resource.MustParse(hardConfigMaps)
345343
err = waitForResourceQuota(f.ClientSet, f.Namespace.Name, quotaName, usedResources)
346344
framework.ExpectNoError(err)
@@ -1478,7 +1476,7 @@ func newTestResourceQuota(name string) *v1.ResourceQuota {
14781476
hard[v1.ResourceQuotas] = resource.MustParse("1")
14791477
hard[v1.ResourceCPU] = resource.MustParse("1")
14801478
hard[v1.ResourceMemory] = resource.MustParse("500Mi")
1481-
hard[v1.ResourceConfigMaps] = resource.MustParse("2")
1479+
hard[v1.ResourceConfigMaps] = resource.MustParse("10")
14821480
hard[v1.ResourceSecrets] = resource.MustParse("10")
14831481
hard[v1.ResourcePersistentVolumeClaims] = resource.MustParse("10")
14841482
hard[v1.ResourceRequestsStorage] = resource.MustParse("10Gi")

0 commit comments

Comments
 (0)
0