@@ -320,6 +320,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
320
320
ginkgo .By ("Creating a ResourceQuota" )
321
321
quotaName := "test-quota"
322
322
resourceQuota := newTestResourceQuota (quotaName )
323
+ resourceQuota .Spec .Hard [v1 .ResourceConfigMaps ] = resource .MustParse (hardConfigMaps )
323
324
_ , err = createResourceQuota (f .ClientSet , f .Namespace .Name , resourceQuota )
324
325
framework .ExpectNoError (err )
325
326
@@ -338,9 +339,6 @@ var _ = SIGDescribe("ResourceQuota", func() {
338
339
ginkgo .By ("Ensuring resource quota status captures configMap creation" )
339
340
usedResources = v1.ResourceList {}
340
341
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
344
342
usedResources [v1 .ResourceConfigMaps ] = resource .MustParse (hardConfigMaps )
345
343
err = waitForResourceQuota (f .ClientSet , f .Namespace .Name , quotaName , usedResources )
346
344
framework .ExpectNoError (err )
@@ -1478,7 +1476,7 @@ func newTestResourceQuota(name string) *v1.ResourceQuota {
1478
1476
hard [v1 .ResourceQuotas ] = resource .MustParse ("1" )
1479
1477
hard [v1 .ResourceCPU ] = resource .MustParse ("1" )
1480
1478
hard [v1 .ResourceMemory ] = resource .MustParse ("500Mi" )
1481
- hard [v1 .ResourceConfigMaps ] = resource .MustParse ("2 " )
1479
+ hard [v1 .ResourceConfigMaps ] = resource .MustParse ("10 " )
1482
1480
hard [v1 .ResourceSecrets ] = resource .MustParse ("10" )
1483
1481
hard [v1 .ResourcePersistentVolumeClaims ] = resource .MustParse ("10" )
1484
1482
hard [v1 .ResourceRequestsStorage ] = resource .MustParse ("10Gi" )
0 commit comments