From e7b0ec5857f8c6a8cba3b0e39aaf003fc5989ca9 Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Mon, 15 Mar 2021 16:54:45 -0400
Subject: [PATCH] Replicate update/patch operations from eviction test in
 conformance CRUD test

---
 test/conformance/testdata/conformance.yaml |  5 +++--
 test/e2e/apps/disruption.go                | 26 ++++++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml
index f0141dd05de..9790a318a87 100755
--- a/test/conformance/testdata/conformance.yaml
+++ b/test/conformance/testdata/conformance.yaml
@@ -704,9 +704,10 @@
   description: PodDisruptionBudget API must support list and deletecollection operations.
   release: v1.21
   file: test/e2e/apps/disruption.go
-- testname: 'PodDisruptionBudget: create and delete object'
+- testname: 'PodDisruptionBudget: create, update, patch, and delete object'
   codename: '[sig-apps] DisruptionController should create a PodDisruptionBudget [Conformance]'
-  description: PodDisruptionBudget API must support create and delete operations.
+  description: PodDisruptionBudget API must support create, update, patch, and delete
+    operations.
   release: v1.21
   file: test/e2e/apps/disruption.go
 - testname: 'PodDisruptionBudget: Status updates'
diff --git a/test/e2e/apps/disruption.go b/test/e2e/apps/disruption.go
index 431e21e0d0e..4566f77b6c1 100644
--- a/test/e2e/apps/disruption.go
+++ b/test/e2e/apps/disruption.go
@@ -98,11 +98,33 @@ var _ = SIGDescribe("DisruptionController", func() {
 
 	/*
 		Release : v1.21
-		Testname: PodDisruptionBudget: create and delete object
-		Description: PodDisruptionBudget API must support create and delete operations.
+		Testname: PodDisruptionBudget: create, update, patch, and delete object
+		Description: PodDisruptionBudget API must support create, update, patch, and delete operations.
 	*/
 	framework.ConformanceIt("should create a PodDisruptionBudget", func() {
+		ginkgo.By("creating the pdb")
 		createPDBMinAvailableOrDie(cs, ns, defaultName, intstr.FromString("1%"), defaultLabels)
+
+		ginkgo.By("updating the pdb")
+		updatedPDB := updatePDBOrDie(cs, ns, defaultName, func(pdb *policyv1.PodDisruptionBudget) *policyv1.PodDisruptionBudget {
+			newMinAvailable := intstr.FromString("2%")
+			pdb.Spec.MinAvailable = &newMinAvailable
+			return pdb
+		}, cs.PolicyV1().PodDisruptionBudgets(ns).Update)
+		framework.ExpectEqual(updatedPDB.Spec.MinAvailable.String(), "2%")
+
+		ginkgo.By("patching the pdb")
+		patchedPDB := patchPDBOrDie(cs, dc, ns, defaultName, func(old *policyv1.PodDisruptionBudget) (bytes []byte, err error) {
+			newBytes, err := json.Marshal(map[string]interface{}{
+				"spec": map[string]interface{}{
+					"minAvailable": "3%",
+				},
+			})
+			framework.ExpectNoError(err, "failed to marshal JSON for new data")
+			return newBytes, nil
+		})
+		framework.ExpectEqual(patchedPDB.Spec.MinAvailable.String(), "3%")
+
 		deletePDBOrDie(cs, ns, defaultName)
 	})