wip

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

Author: csviri

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

@@ -237,6 +237,12 @@ private static <P extends HasMetadata> P pollLocalCache(
     }
   }
 
+  /** Adds finalizer using JSON Patch. Retries conflicts and unprocessable content (HTTP 422) */
+  @SuppressWarnings("unchecked")
+  public static <P extends HasMetadata> P addFinalizer(Context<P> context, String finalizer) {
+    return addFinalizer(context.getClient(), context.getPrimaryResource(), finalizer);
+  }
+
   /** Adds finalizer using JSON Patch. Retries conflicts and unprocessable content (HTTP 422) */
   @SuppressWarnings("unchecked")
   public static <P extends HasMetadata> P addFinalizer(
@@ -251,6 +257,11 @@ public static <P extends HasMetadata> P addFinalizer(
         r -> !r.hasFinalizer(finalizerName));
   }
 
+  public static <P extends HasMetadata> P removeFinalizer(
+      Context<P> context, String finalizerName) {
+    return removeFinalizer(context.getClient(), context.getPrimaryResource(), finalizerName);
+  }
+
   public static <P extends HasMetadata> P removeFinalizer(
       KubernetesClient client, P resource, String finalizerName) {
     return conflictRetryingPatch(

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/triggerallevent/onlyreconcile/TriggerReconcilerOnAllEventReconciler.java

@@ -53,7 +53,7 @@ public UpdateControl<TriggerReconcilerOnAllEventCustomResource> reconcile(
 
     if (!primary.isMarkedForDeletion() && getUseFinalizer() && !primary.hasFinalizer(FINALIZER)) {
       log.info("Adding finalizer");
-      PrimaryUpdateAndCacheUtils.addFinalizer(primary, FINALIZER, context);
+      PrimaryUpdateAndCacheUtils.addFinalizer(context, FINALIZER);
       return UpdateControl.noUpdate();
     }
 
@@ -76,7 +76,7 @@ public UpdateControl<TriggerReconcilerOnAllEventCustomResource> reconcile(
       setEventOnMarkedForDeletion(true);
       if (getUseFinalizer() && primary.hasFinalizer(FINALIZER)) {
         log.info("Removing finalizer");
-        PrimaryUpdateAndCacheUtils.removeFinalizer(primary, FINALIZER, context);
+        PrimaryUpdateAndCacheUtils.removeFinalizer(context, FINALIZER);
       }
     }