From 168fa73b60b625ed1e69f2cd62f850ba46a24efc Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Tue, 1 Nov 2022 09:20:38 +1300 Subject: [PATCH] Promote ResourceQuota e2e test to Conformance --- test/conformance/testdata/conformance.yaml | 14 ++++++++++++++ test/e2e/apimachinery/resource_quota.go | 17 ++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index f133c2952c5..5fc894dde5a 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -428,6 +428,20 @@ MUST now include the new Label. release: v1.18 file: test/e2e/apimachinery/namespace.go +- testname: ResourceQuota, apply changes to a ResourceQuota status + codename: '[sig-api-machinery] ResourceQuota should apply changes to a resourcequota + status [Conformance]' + description: Attempt to create a ResourceQuota for CPU and Memory quota limits. + Creation MUST be successful. Updating the hard status values MUST succeed and + the new values MUST be found. The reported hard status values MUST equal the spec + hard values. Patching the spec hard values MUST succeed and the new values MUST + be found. Patching the hard status values MUST succeed. The reported hard status + values MUST equal the new spec hard values. Getting the /status MUST succeed and + the reported hard status values MUST equal the spec hard values. Repatching the + hard status values MUST succeed. The spec spec MUST NOT be changed when patching + /status. + release: v1.26 + file: test/e2e/apimachinery/resource_quota.go - testname: ResourceQuota, update and delete codename: '[sig-api-machinery] ResourceQuota should be able to update and delete ResourceQuota. [Conformance]' diff --git a/test/e2e/apimachinery/resource_quota.go b/test/e2e/apimachinery/resource_quota.go index 3c3dd3b8fc2..a80d0402e5c 100644 --- a/test/e2e/apimachinery/resource_quota.go +++ b/test/e2e/apimachinery/resource_quota.go @@ -992,7 +992,22 @@ var _ = SIGDescribe("ResourceQuota", func() { } }) - ginkgo.It("should apply changes to a resourcequota status", func() { + /* + Release: v1.26 + Testname: ResourceQuota, apply changes to a ResourceQuota status + Description: Attempt to create a ResourceQuota for CPU and Memory + quota limits. Creation MUST be successful. Updating the hard + status values MUST succeed and the new values MUST be found. The + reported hard status values MUST equal the spec hard values. + Patching the spec hard values MUST succeed and the new values MUST + be found. Patching the hard status values MUST succeed. The + reported hard status values MUST equal the new spec hard values. + Getting the /status MUST succeed and the reported hard status + values MUST equal the spec hard values. Repatching the hard status + values MUST succeed. The spec spec MUST NOT be changed when + patching /status. + */ + framework.ConformanceIt("should apply changes to a resourcequota status", func() { ns := f.Namespace.Name rqClient := f.ClientSet.CoreV1().ResourceQuotas(ns) rqName := "e2e-rq-status-" + utilrand.String(5)