Finalizer utils

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/FinalizerUtils.java

@@ -0,0 +1,48 @@
+package io.javaoperatorsdk.operator.api.reconciler;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
+public class FinalizerUtils {
+
+  private static final Logger log = LoggerFactory.getLogger(FinalizerUtils.class);
+
+  // todo SSA
+
+  public static <P extends HasMetadata> P patchFinalizer(
+      P resource, String finalizer, Context<P> context) {
+    return PrimaryUpdateAndCacheUtils.updateAndCacheResource(
+        resource,
+        context,
+        r -> r,
+        r ->
+            context
+                .getClient()
+                .resource(r)
+                .edit(
+                    res -> {
+                      res.addFinalizer(finalizer);
+                      return res;
+                    }));
+  }
+
+  public static <P extends HasMetadata> P removeFinalizer(
+      P resource, String finalizer, Context<P> context) {
+
+    return PrimaryUpdateAndCacheUtils.updateAndCacheResource(
+        resource,
+        context,
+        r -> r,
+        r ->
+            context
+                .getClient()
+                .resource(r)
+                .edit(
+                    res -> {
+                      res.removeFinalizer(finalizer);
+                      return res;
+                    }));
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventReconciler.java

@@ -3,6 +3,7 @@
 import io.javaoperatorsdk.operator.api.config.ControllerMode;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.FinalizerUtils;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 import io.javaoperatorsdk.operator.baseapi.alleventmode.AbstractAllEventReconciler;
@@ -22,16 +23,14 @@ public UpdateControl<AllEventCustomResource> reconcile(
     }
 
     if (getUseFinalizer() && !resource.hasFinalizer(FINALIZER)) {
-      resource.addFinalizer(FINALIZER);
-      context.getClient().resource(resource).update();
+      FinalizerUtils.patchFinalizer(resource, FINALIZER, context);
       return UpdateControl.noUpdate();
     }
 
     if (resource.isMarkedForDeletion() && !context.isDeleteEventPresent()) {
       setEventOnMarkedForDeletion(true);
       if (getUseFinalizer() && resource.hasFinalizer(FINALIZER)) {
-        resource.removeFinalizer(FINALIZER);
-        context.getClient().resource(resource).update();
+        FinalizerUtils.removeFinalizer(resource, FINALIZER, context);
       }
     }