diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 652d0f62928..f0141dd05de 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -698,6 +698,17 @@ MUST succeed. It MUST succeed when deleting the Deployment. release: v1.20 file: test/e2e/apps/deployment.go +- testname: 'PodDisruptionBudget: list and delete collection' + codename: '[sig-apps] DisruptionController Listing PodDisruptionBudgets for all + namespaces should list and delete a collection of PodDisruptionBudgets [Conformance]' + description: PodDisruptionBudget API must support list and deletecollection operations. + release: v1.21 + file: test/e2e/apps/disruption.go +- testname: 'PodDisruptionBudget: create and delete object' + codename: '[sig-apps] DisruptionController should create a PodDisruptionBudget [Conformance]' + description: PodDisruptionBudget API must support create and delete operations. + release: v1.21 + file: test/e2e/apps/disruption.go - testname: 'PodDisruptionBudget: Status updates' codename: '[sig-apps] DisruptionController should observe PodDisruptionBudget status updated [Conformance]' @@ -705,6 +716,13 @@ are allowed. release: v1.21 file: test/e2e/apps/disruption.go +- testname: 'PodDisruptionBudget: update and patch status' + codename: '[sig-apps] DisruptionController should update/patch PodDisruptionBudget + status [Conformance]' + description: PodDisruptionBudget API must support update and patch operations on + status subresource. + release: v1.21 + file: test/e2e/apps/disruption.go - testname: Jobs, orphan pods, re-adoption codename: '[sig-apps] Job should adopt matching orphans and release non-matching pods [Conformance]' diff --git a/test/e2e/apps/disruption.go b/test/e2e/apps/disruption.go index dc855079353..431e21e0d0e 100644 --- a/test/e2e/apps/disruption.go +++ b/test/e2e/apps/disruption.go @@ -75,7 +75,12 @@ var _ = SIGDescribe("DisruptionController", func() { ginkgo.Context("Listing PodDisruptionBudgets for all namespaces", func() { anotherFramework := framework.NewDefaultFramework("disruption-2") - ginkgo.It("should list and delete a collection of PodDisruptionBudgets", func() { + /* + Release : v1.21 + Testname: PodDisruptionBudget: list and delete collection + Description: PodDisruptionBudget API must support list and deletecollection operations. + */ + framework.ConformanceIt("should list and delete a collection of PodDisruptionBudgets", func() { specialLabels := map[string]string{"foo_pdb": "bar_pdb"} labelSelector := labels.SelectorFromSet(specialLabels).String() createPDBMinAvailableOrDie(cs, ns, defaultName, intstr.FromInt(2), specialLabels) @@ -91,8 +96,14 @@ var _ = SIGDescribe("DisruptionController", func() { }) }) - ginkgo.It("should create a PodDisruptionBudget", func() { + /* + Release : v1.21 + Testname: PodDisruptionBudget: create and delete object + Description: PodDisruptionBudget API must support create and delete operations. + */ + framework.ConformanceIt("should create a PodDisruptionBudget", func() { createPDBMinAvailableOrDie(cs, ns, defaultName, intstr.FromString("1%"), defaultLabels) + deletePDBOrDie(cs, ns, defaultName) }) /* @@ -119,7 +130,12 @@ var _ = SIGDescribe("DisruptionController", func() { framework.ExpectNoError(err) }) - ginkgo.It("should update/patch PodDisruptionBudget status", func() { + /* + Release : v1.21 + Testname: PodDisruptionBudget: update and patch status + Description: PodDisruptionBudget API must support update and patch operations on status subresource. + */ + framework.ConformanceIt("should update/patch PodDisruptionBudget status", func() { createPDBMinAvailableOrDie(cs, ns, defaultName, intstr.FromInt(1), defaultLabels) ginkgo.By("Updating PodDisruptionBudget status")