IT fixes

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -995,7 +995,33 @@ <R extends HasMetadata> R resourcePatch(
    * @see #addFinalizer(String)
    */
   public P addFinalizer() {
-    return addFinalizer(context.getControllerConfiguration().getFinalizerName());
+    return addFinalizer(context.getControllerConfiguration().getFinalizerName(), false);
+  }
+
+  /**
+   * Adds the default finalizer (from controller configuration) to the primary resource. This is a
+   * convenience method that calls {@link #addFinalizer(String, boolean)} with the configured
+   * finalizer name.
+   *
+   * @param cacheOnly if {@code true} the finalizer patch does not filter its own event (see {@link
+   *     #addFinalizer(String, boolean)})
+   * @return updated resource from the server response
+   * @see #addFinalizer(String, boolean)
+   */
+  public P addFinalizer(boolean cacheOnly) {
+    return addFinalizer(context.getControllerConfiguration().getFinalizerName(), cacheOnly);
+  }
+
+  /**
+   * Adds the given finalizer to the primary resource, filtering the own event (equivalent to {@link
+   * #addFinalizer(String, boolean)} with {@code cacheOnly = false}).
+   *
+   * @param finalizerName name of the finalizer to add
+   * @return updated resource from the server response
+   * @see #addFinalizer(String, boolean)
+   */
+  public P addFinalizer(String finalizerName) {
+    return addFinalizer(finalizerName, false);
   }
 
   /**
@@ -1005,9 +1031,13 @@ public P addFinalizer() {
    * "Trigger reconciliation on all event" mode is on.
    *
    * @param finalizerName name of the finalizer to add
+   * @param cacheOnly if {@code true} the finalizer patch only caches the response and does
+   *     <em>not</em> filter the resulting own event, so a subsequent reconciliation is triggered by
+   *     the finalizer addition; if {@code false} the default JSON Patch matcher is used and the own
+   *     event is filtered
    * @return updated resource from the server response
    */
-  public P addFinalizer(String finalizerName) {
+  public P addFinalizer(String finalizerName, boolean cacheOnly) {
     var resource = context.getPrimaryResource();
     if (resource.isMarkedForDeletion() || resource.hasFinalizer(finalizerName)) {
       return resource;
@@ -1017,7 +1047,8 @@ public P addFinalizer(String finalizerName) {
           r.addFinalizer(finalizerName);
           return r;
         },
-        r -> !r.hasFinalizer(finalizerName));
+        r -> !r.hasFinalizer(finalizerName),
+        cacheOnly);
   }
 
   /**
@@ -1061,6 +1092,22 @@ public P removeFinalizer(String finalizerName) {
         });
   }
 
+  /**
+   * Patches the primary resource using JSON Patch, retrying on conflict, filtering the own event
+   * via the default JSON Patch matcher (equivalent to {@link
+   * #conflictRetryingPatchPrimary(UnaryOperator, Predicate, boolean)} with {@code cacheOnly =
+   * false}).
+   *
+   * @param resourceChangesOperator changes to be done on the resource before update
+   * @param preCondition condition to check if the patch operation still needs to be performed or
+   *     not
+   * @return updated resource from the server or unchanged if the precondition does not hold
+   */
+  public P conflictRetryingPatchPrimary(
+      UnaryOperator<P> resourceChangesOperator, Predicate<P> preCondition) {
+    return conflictRetryingPatchPrimary(resourceChangesOperator, preCondition, false);
+  }
+
   /**
    * Patches the primary resource using JSON Patch, retrying on conflict. The {@code
    * resourceChangesOperator} is applied to the current resource before each attempt; if the server
@@ -1071,12 +1118,15 @@ public P removeFinalizer(String finalizerName) {
    * @param resourceChangesOperator changes to be done on the resource before update
    * @param preCondition condition to check if the patch operation still needs to be performed or
    *     not; evaluated against the (possibly re-fetched) resource before each attempt
+   * @param cacheOnly if {@code true} the patch only caches the response and does <em>not</em>
+   *     filter the resulting own event; if {@code false} the default JSON Patch matcher is used and
+   *     the own event is filtered
    * @return updated resource from the server or unchanged if the precondition does not hold
    * @throws OperatorException if the maximum number of retry attempts is exceeded
    */
   @SuppressWarnings("unchecked")
   public P conflictRetryingPatchPrimary(
-      UnaryOperator<P> resourceChangesOperator, Predicate<P> preCondition) {
+      UnaryOperator<P> resourceChangesOperator, Predicate<P> preCondition, boolean cacheOnly) {
     var resource = context.getPrimaryResource();
     var client = context.getClient();
     if (log.isDebugEnabled()) {
@@ -1088,7 +1138,12 @@ public P conflictRetryingPatchPrimary(
         if (!preCondition.test(resource)) {
           return resource;
         }
-        return jsonPatchPrimary(resource, resourceChangesOperator);
+        return jsonPatchPrimary(
+            resource,
+            resourceChangesOperator,
+            cacheOnly
+                ? Options.cacheOnly()
+                : Options.matchAndFilterWithDefaultMatcher(UpdateType.JSON_PATCH));
       } catch (KubernetesClientException e) {
         log.trace("Exception during patch for resource: {}", resource);
         retryIndex++;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

@@ -137,7 +137,7 @@ private PostExecutionControl<P> handleReconcile(
       if (useSSA) {
         updatedResource = context.resourceOperations().addFinalizerWithSSA();
       } else {
-        updatedResource = context.resourceOperations().addFinalizer();
+        updatedResource = context.resourceOperations().addFinalizer(true);
       }
       return PostExecutionControl.onlyFinalizerAdded(updatedResource);
     } else {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java

@@ -169,7 +169,7 @@ void addFinalizerOnNewResourceWithoutSSA() throws Exception {
     dispatcher.handleDispatch(executionScopeWithCREvent(testCustomResource), createTestContext());
 
     verify(reconciler, never()).reconcile(ArgumentMatchers.eq(testCustomResource), any());
-    verify(mockResourceOperations, times(1)).addFinalizer();
+    verify(mockResourceOperations, times(1)).addFinalizer(true);
   }
 
   @Test

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/filterpatchevent/FilterPatchEventTestReconciler.java

@@ -42,11 +42,12 @@ public UpdateControl<FilterPatchEventTestCustomResource> reconcile(
     resource.setStatus(new FilterPatchEventTestCustomResourceStatus());
     resource.getStatus().setValue(UPDATED);
 
-    var uc = UpdateControl.patchStatus(resource);
+    context.resourceOperations().jsonMergePatchPrimaryStatus(resource);
     if (!filterPatchEvent.get()) {
-      uc = uc.reschedule();
+      return UpdateControl.<FilterPatchEventTestCustomResource>noUpdate().reschedule();
+    } else {
+      return UpdateControl.noUpdate();
     }
-    return uc;
   }
 
   public int getNumberOfExecutions() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java

@@ -52,7 +52,7 @@ void configMapGetsCreatedForTestCustomResource() {
 
     awaitResourcesCreatedOrUpdated();
     awaitStatusUpdated();
-    assertThat(TestUtils.getNumberOfExecutions(operator)).isEqualTo(1);
+    assertThat(TestUtils.getNumberOfExecutions(operator)).isEqualTo(2);
   }
 
   @Test