fix #5020: updating the resourceVersion on delete with finalizers

CHANGELOG.md

@@ -10,6 +10,7 @@
 * Fix #4988: Ensuring that previous requests are closed before retry
 * fix #5002: Jetty response completion accounts for header processing
 * Fix #5009: addressing issue with serialization of wrapped polymophic types
+* Fix #5020: updating the resourceVersion on a delete with finalizers
 
 #### Improvements
 * Fix #4434: Update CronJobIT to use `batch/v1` CronJob instead

junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java

@@ -214,6 +214,7 @@ private void processDelete(String path, AttributeSet pathAttributes, AttributeSe
     if (!resource.isMarkedForDeletion()) {
       // Mark the resource as deleted, but don't remove it yet (wait for finalizer-removal).
       resource.getMetadata().setDeletionTimestamp(LocalDateTime.now().toString());
+      resource.getMetadata().setResourceVersion(String.valueOf(requestResourceVersion()));
       String updatedResource = Serialization.asJson(resource);
       processEvent(path, pathAttributes, oldAttributes, resource, updatedResource);
       return;

junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherFinalizerTest.java

@@ -60,8 +60,7 @@ void tearDown() {
   private Owl createOwlWithFinalizer(String owlName) {
     final Owl owl = new Owl();
     owl.setMetadata(new ObjectMetaBuilder().withName(owlName).withFinalizers("test-finalizer").build());
-    client.resources(Owl.class).resource(owl).create();
-    return owl;
+    return client.resources(Owl.class).resource(owl).create();
   }
 
   @Test
@@ -96,6 +95,7 @@ void deleteResourceWithFinalizerTwiceSameDeletionTimestamp() {
     String deletionTimestamp1 = owl1.getMetadata().getDeletionTimestamp();
     assertNotNull(deletionTimestamp1);
     assertDoesNotThrow(() -> DateTimeFormatter.ISO_DATE_TIME.parse(deletionTimestamp1));
+    assertNotEquals(initialOwl.getMetadata().getResourceVersion(), owl1.getMetadata().getResourceVersion());
 
     // When the owl is deleted a second time:
     client.resources(Owl.class).resource(owl1).delete();