finalizer removal with patch without SSA

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

Author: csviri

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

@@ -312,7 +312,7 @@ private PostExecutionControl<P> handleCleanup(P resource,
             return false;
           }
           return r.removeFinalizer(finalizerName);
-        });
+        },true);
         return PostExecutionControl.customResourceFinalizerRemoved(customResource);
       }
     }
@@ -351,7 +351,7 @@ private P updateCustomResourceWithFinalizer(P resourceForExecution, P originalRe
         "Adding finalizer for resource: {} version: {}", getUID(originalResource),
         getVersion(originalResource));
     return conflictRetryingPatch(resourceForExecution, originalResource,
-        r -> r.addFinalizer(configuration().getFinalizerName()));
+        r -> r.addFinalizer(configuration().getFinalizerName()), false);
   }
 
   private P patchResource(P resource, P originalResource) {
@@ -373,7 +373,7 @@ ControllerConfiguration<P> configuration() {
   }
 
   public P conflictRetryingPatch(P resource, P originalResource,
-      Function<P, Boolean> modificationFunction) {
+      Function<P, Boolean> modificationFunction, boolean forceNotUseSSA) {
     if (log.isDebugEnabled()) {
       log.debug("Conflict retrying update for: {}", ResourceID.fromResource(resource));
     }
@@ -384,7 +384,11 @@ public P conflictRetryingPatch(P resource, P originalResource,
         if (Boolean.FALSE.equals(modified)) {
           return resource;
         }
-        return customResourceFacade.patchResource(resource, originalResource);
+        if (forceNotUseSSA) {
+          return customResourceFacade.patchResourceWithoutSSA(resource,originalResource);
+        } else {
+          return customResourceFacade.patchResource(resource, originalResource);
+        }
       } catch (KubernetesClientException e) {
         log.trace("Exception during patch for resource: {}", resource);
         retryIndex++;
@@ -428,6 +432,10 @@ public R getResource(String namespace, String name) {
       }
     }
 
+    public R patchResourceWithoutSSA(R resource, R originalResource) {
+      return resource(originalResource).edit(r -> resource);
+    }
+
     public R patchResource(R resource, R originalResource) {
       if (log.isDebugEnabled()) {
         log.debug(
@@ -475,6 +483,7 @@ public R patchStatus(R resource, R originalResource) {
 
     public R patchResourceWithSSA(R resource) {
       var managedFields = resource.getMetadata().getManagedFields();
+      resource.getMetadata().setManagedFields(null);
       try {
         return resource(resource).patch(new PatchContext.Builder()
             .withFieldManager(fieldManager)

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

@@ -197,7 +197,7 @@ void removesDefaultFinalizerOnDeleteIfSet() {
         reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
 
     assertThat(postExecControl.isFinalizerRemoved()).isTrue();
-    verify(customResourceFacade, times(1)).patchResource(eq(testCustomResource), any());
+    verify(customResourceFacade, times(1)).patchResourceWithoutSSA(eq(testCustomResource), any());
   }
 
   @Test
@@ -206,7 +206,7 @@ void retriesFinalizerRemovalWithFreshResource() {
     markForDeletion(testCustomResource);
     var resourceWithFinalizer = TestUtils.testCustomResource();
     resourceWithFinalizer.addFinalizer(DEFAULT_FINALIZER);
-    when(customResourceFacade.patchResource(eq(testCustomResource), any()))
+    when(customResourceFacade.patchResourceWithoutSSA(eq(testCustomResource), any()))
         .thenThrow(new KubernetesClientException(null, 409, null))
         .thenReturn(testCustomResource);
     when(customResourceFacade.getResource(any(), any())).thenReturn(resourceWithFinalizer);
@@ -215,7 +215,7 @@ void retriesFinalizerRemovalWithFreshResource() {
         reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
 
     assertThat(postExecControl.isFinalizerRemoved()).isTrue();
-    verify(customResourceFacade, times(2)).patchResource(any(), any());
+    verify(customResourceFacade, times(2)).patchResourceWithoutSSA(any(), any());
     verify(customResourceFacade, times(1)).getResource(any(), any());
   }
 
@@ -225,23 +225,23 @@ void nullResourceIsGracefullyHandledOnFinalizerRemovalRetry() {
     // of the finalizer removal
     testCustomResource.addFinalizer(DEFAULT_FINALIZER);
     markForDeletion(testCustomResource);
-    when(customResourceFacade.patchResource(any(), any()))
+    when(customResourceFacade.patchResourceWithoutSSA(any(), any()))
         .thenThrow(new KubernetesClientException(null, 409, null));
     when(customResourceFacade.getResource(any(), any())).thenReturn(null);
 
     var postExecControl =
         reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
 
     assertThat(postExecControl.isFinalizerRemoved()).isTrue();
-    verify(customResourceFacade, times(1)).patchResource(eq(testCustomResource), any());
+    verify(customResourceFacade, times(1)).patchResourceWithoutSSA(eq(testCustomResource), any());
     verify(customResourceFacade, times(1)).getResource(any(), any());
   }
 
   @Test
   void throwsExceptionIfFinalizerRemovalRetryExceeded() {
     testCustomResource.addFinalizer(DEFAULT_FINALIZER);
     markForDeletion(testCustomResource);
-    when(customResourceFacade.patchResource(any(), any()))
+    when(customResourceFacade.patchResourceWithoutSSA(any(), any()))
         .thenThrow(new KubernetesClientException(null, 409, null));
     when(customResourceFacade.getResource(any(), any()))
         .thenAnswer((Answer<TestCustomResource>) invocationOnMock -> createResourceWithFinalizer());
@@ -253,7 +253,7 @@ void throwsExceptionIfFinalizerRemovalRetryExceeded() {
     assertThat(postExecControl.getRuntimeException()).isPresent();
     assertThat(postExecControl.getRuntimeException().get())
         .isInstanceOf(OperatorException.class);
-    verify(customResourceFacade, times(MAX_UPDATE_RETRY)).patchResource(any(), any());
+    verify(customResourceFacade, times(MAX_UPDATE_RETRY)).patchResourceWithoutSSA(any(), any());
     verify(customResourceFacade, times(MAX_UPDATE_RETRY - 1)).getResource(any(),
         any());
   }
@@ -262,15 +262,15 @@ void throwsExceptionIfFinalizerRemovalRetryExceeded() {
   void throwsExceptionIfFinalizerRemovalClientExceptionIsNotConflict() {
     testCustomResource.addFinalizer(DEFAULT_FINALIZER);
     markForDeletion(testCustomResource);
-    when(customResourceFacade.patchResource(any(), any()))
+    when(customResourceFacade.patchResourceWithoutSSA(any(), any()))
         .thenThrow(new KubernetesClientException(null, 400, null));
 
     var res =
         reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
 
     assertThat(res.getRuntimeException()).isPresent();
     assertThat(res.getRuntimeException().get()).isInstanceOf(KubernetesClientException.class);
-    verify(customResourceFacade, times(1)).patchResource(any(), any());
+    verify(customResourceFacade, times(1)).patchResourceWithoutSSA(any(), any());
     verify(customResourceFacade, never()).getResource(any(), any());
   }
 

sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorAbstractTest.java

@@ -37,7 +37,7 @@ public abstract class WebPageOperatorAbstractTest {
   public static final String TEST_PAGE = "test-page";
   public static final String TITLE1 = "Hello Operator World";
   public static final String TITLE2 = "Hello Operator World Title 2";
-  public static final int WAIT_SECONDS = 20;
+  public static final int WAIT_SECONDS = 360;
   public static final int LONG_WAIT_SECONDS = 120;
   public static final Duration POLL_INTERVAL = Duration.ofSeconds(1);