fix CRD cleanup method having issues with PATCH status as the resourceVersion is not synchronized in the operator primary cache

Author: ThoSap

operator/src/main/java/it/aboutbits/postgresql/crd/database/DatabaseReconciler.java

@@ -117,6 +117,9 @@ public DeleteControl cleanup(
             }
 
             context.getClient().resource(resource).patchStatus();
+
+            return DeleteControl.noFinalizerRemoval()
+                    .rescheduleAfter(1, TimeUnit.SECONDS);
         }
 
         // We do not actually delete the database if the reclaimPolicy is set to RETAIN, we only delete the CR instance

operator/src/main/java/it/aboutbits/postgresql/crd/defaultprivilege/DefaultPrivilegeReconciler.java

@@ -136,6 +136,9 @@ public DeleteControl cleanup(
                     .setMessage("DefaultPrivilege deletion in progress");
 
             context.getClient().resource(resource).patchStatus();
+
+            return DeleteControl.noFinalizerRemoval()
+                    .rescheduleAfter(1, TimeUnit.SECONDS);
         }
 
         var clusterRef = spec.getClusterRef();
@@ -166,11 +169,13 @@ public DeleteControl cleanup(
 
                 var currentDefaultPrivileges = defaultPrivilegeService.determineCurrentDefaultPrivileges(tx, spec);
 
-                defaultPrivilegeService.revoke(
-                        tx,
-                        spec,
-                        currentDefaultPrivileges
-                );
+                if (!currentDefaultPrivileges.isEmpty()) {
+                    defaultPrivilegeService.revoke(
+                            tx,
+                            spec,
+                            currentDefaultPrivileges
+                    );
+                }
             });
 
             return DeleteControl.defaultDelete();

operator/src/main/java/it/aboutbits/postgresql/crd/grant/GrantReconciler.java

@@ -141,6 +141,9 @@ public DeleteControl cleanup(
                     .setMessage("Grant deletion in progress");
 
             context.getClient().resource(resource).patchStatus();
+
+            return DeleteControl.noFinalizerRemoval()
+                    .rescheduleAfter(1, TimeUnit.SECONDS);
         }
 
         var clusterRef = spec.getClusterRef();

operator/src/main/java/it/aboutbits/postgresql/crd/role/RoleReconciler.java

@@ -147,6 +147,9 @@ public DeleteControl cleanup(
                     .setMessage("Role deletion in progress");
 
             context.getClient().resource(resource).patchStatus();
+
+            return DeleteControl.noFinalizerRemoval()
+                    .rescheduleAfter(1, TimeUnit.SECONDS);
         }
 
         var clusterRef = spec.getClusterRef();

operator/src/main/java/it/aboutbits/postgresql/crd/schema/SchemaReconciler.java

@@ -119,6 +119,9 @@ public DeleteControl cleanup(
             }
 
             context.getClient().resource(resource).patchStatus();
+
+            return DeleteControl.noFinalizerRemoval()
+                    .rescheduleAfter(1, TimeUnit.SECONDS);
         }
 
         // We do not actually delete the schema if the reclaimPolicy is set to RETAIN, we only delete the CR instance