fixes

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

Author: csviri

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

@@ -403,7 +403,7 @@ private P updateCustomResourceWithFinalizer(P resourceForExecution, P originalRe
         resourceForExecution,
         originalResource,
         r -> r.addFinalizer(configuration().getFinalizerName()),
-        false);
+        true);
   }
 
   private P patchResource(Context<P> context, P resource, P originalResource) {

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

@@ -164,19 +164,17 @@ void addFinalizerOnNewResource() {
 
   @Test
   void addFinalizerOnNewResourceWithoutSSA() {
-    initConfigService(false);
+    initConfigService(false, false);
     final ReconciliationDispatcher<TestCustomResource> dispatcher =
         init(testCustomResource, reconciler, null, customResourceFacade, true);
 
     assertFalse(testCustomResource.hasFinalizer(DEFAULT_FINALIZER));
     dispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
     verify(reconciler, never()).reconcile(ArgumentMatchers.eq(testCustomResource), any());
     verify(customResourceFacade, times(1))
-        .patchResource(
-            any(),
-            argThat(testCustomResource -> testCustomResource.hasFinalizer(DEFAULT_FINALIZER)),
-            any());
-    assertThat(testCustomResource.hasFinalizer(DEFAULT_FINALIZER)).isTrue();
+        .patchResourceWithoutSSA(
+            argThat(cr -> cr.hasFinalizer(DEFAULT_FINALIZER)),
+            argThat(cr -> !cr.hasFinalizer(DEFAULT_FINALIZER)));
   }
 
   @Test
@@ -668,7 +666,7 @@ void retriesAddingFinalizerWithoutSSA() {
 
     removeFinalizers(testCustomResource);
     reconciler.reconcile = (r, c) -> UpdateControl.noUpdate();
-    when(customResourceFacade.patchResource(any(), any(), any()))
+    when(customResourceFacade.patchResourceWithoutSSA(any(), any()))
         .thenThrow(new KubernetesClientException(null, 409, null))
         .thenReturn(testCustomResource);
     when(customResourceFacade.getResource(any(), any()))
@@ -681,7 +679,7 @@ void retriesAddingFinalizerWithoutSSA() {
 
     reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
 
-    verify(customResourceFacade, times(2)).patchResource(any(), any(), any());
+    verify(customResourceFacade, times(2)).patchResourceWithoutSSA(any(), any());
   }
 
   @Test