wip

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

Author: csviri

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

@@ -101,7 +101,7 @@ && shouldNotDispatchToCleanupWhenMarkedForDeletion(originalResource)) {
 
     // checking the cleaner for all-event-mode
     if (markedForDeletion && controller.isCleaner()) {
-      return handleCleanup(resourceForExecution, originalResource, context);
+      return handleCleanup(resourceForExecution, originalResource, context, executionScope);
     } else {
       return handleReconcile(executionScope, resourceForExecution, originalResource, context);
     }
@@ -166,7 +166,7 @@ private PostExecutionControl<P> reconcileExecution(
     P updatedCustomResource = null;
     if (useSSA) {
       if (updateControl.isNoUpdate()) {
-        return createPostExecutionControl(null, updateControl);
+        return createPostExecutionControl(null, updateControl, executionScope);
       } else {
         toUpdate = updateControl.getResource().orElseThrow();
       }
@@ -187,7 +187,7 @@ private PostExecutionControl<P> reconcileExecution(
     if (updateControl.isPatchStatus()) {
       customResourceFacade.patchStatus(toUpdate, originalResource);
     }
-    return createPostExecutionControl(updatedCustomResource, updateControl);
+    return createPostExecutionControl(updatedCustomResource, updateControl, executionScope);
   }
 
   private PostExecutionControl<P> handleErrorStatusHandler(
@@ -247,25 +247,40 @@ public boolean isLastAttempt() {
   }
 
   private PostExecutionControl<P> createPostExecutionControl(
-      P updatedCustomResource, UpdateControl<P> updateControl) {
+      P updatedCustomResource, UpdateControl<P> updateControl, ExecutionScope<P> executionScope) {
     PostExecutionControl<P> postExecutionControl;
     if (updatedCustomResource != null) {
       postExecutionControl =
           PostExecutionControl.customResourceStatusPatched(updatedCustomResource);
     } else {
       postExecutionControl = PostExecutionControl.defaultDispatch();
     }
-    updatePostExecutionControlWithReschedule(postExecutionControl, updateControl);
+    updatePostExecutionControlWithReschedule(postExecutionControl, updateControl, executionScope);
     return postExecutionControl;
   }
 
+  // todo test
   private void updatePostExecutionControlWithReschedule(
-      PostExecutionControl<P> postExecutionControl, BaseControl<?> baseControl) {
-    baseControl.getScheduleDelay().ifPresent(postExecutionControl::withReSchedule);
+      PostExecutionControl<P> postExecutionControl,
+      BaseControl<?> baseControl,
+      ExecutionScope<P> executionScope) {
+    baseControl
+        .getScheduleDelay()
+        .ifPresent(
+            r -> {
+              if (executionScope.isDeleteEvent()) {
+                log.warn("No re-schedules allowed when delete event present. Will be ignored.");
+              } else {
+                postExecutionControl.withReSchedule(r);
+              }
+            });
   }
 
   private PostExecutionControl<P> handleCleanup(
-      P resourceForExecution, P originalResource, Context<P> context) {
+      P resourceForExecution,
+      P originalResource,
+      Context<P> context,
+      ExecutionScope<P> executionScope) {
     if (log.isDebugEnabled()) {
       log.debug(
           "Executing delete for resource: {} with version: {}",
@@ -274,7 +289,7 @@ private PostExecutionControl<P> handleCleanup(
     }
     DeleteControl deleteControl = controller.cleanup(resourceForExecution, context);
     final var useFinalizer = controller.useFinalizer();
-    if (useFinalizer) {
+    if (useFinalizer && !configuration().isAllEventReconcileMode()) {
       // note that we don't reschedule here even if instructed. Removing finalizer means that
       // cleanup is finished, nothing left to be done
       final var finalizerName = configuration().getFinalizerName();
@@ -308,7 +323,7 @@ private PostExecutionControl<P> handleCleanup(
         deleteControl,
         useFinalizer);
     PostExecutionControl<P> postExecutionControl = PostExecutionControl.defaultDispatch();
-    updatePostExecutionControlWithReschedule(postExecutionControl, deleteControl);
+    updatePostExecutionControlWithReschedule(postExecutionControl, deleteControl, executionScope);
     return postExecutionControl;
   }
 

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

@@ -5,6 +5,7 @@
 public class AbstractAllEventReconciler {
 
   public static final String FINALIZER = "all.event.mode/finalizer";
+  public static final String ADDITIONAL_FINALIZER = "all.event.mode/finalizer2";
 
   private boolean resourceEvent = false;
   private boolean deleteEvent = false;

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/cleaner/AllEventCleanerCustomResource.java

@@ -0,0 +1,13 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.cleaner;
+
+import io.fabric8.kubernetes.api.model.Namespaced;
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.ShortNames;
+import io.fabric8.kubernetes.model.annotation.Version;
+
+@Group("sample.javaoperatorsdk")
+@Version("v1")
+@ShortNames("aeccs")
+public class AllEventCleanerCustomResource extends CustomResource<AllEventCleanerSpec, Void>
+    implements Namespaced {}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/cleaner/AllEventCleanerIT.java

@@ -1,3 +1,56 @@
 package io.javaoperatorsdk.operator.baseapi.alleventmode.cleaner;
 
-public class AllEventCleanerIT {}
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.baseapi.alleventmode.onlyreconcile.AllEventCustomResource;
+import io.javaoperatorsdk.operator.baseapi.alleventmode.onlyreconcile.AllEventReconciler;
+import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+
+import static io.javaoperatorsdk.operator.baseapi.alleventmode.AbstractAllEventReconciler.FINALIZER;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+public class AllEventCleanerIT {
+
+  public static final String TEST = "test1";
+
+  @RegisterExtension
+  LocallyRunOperatorExtension extension =
+      LocallyRunOperatorExtension.builder().withReconciler(new AllEventCleanerReconciler()).build();
+
+  @Test
+  void eventsPresent() {
+    var reconciler = extension.getReconcilerOfType(AllEventReconciler.class);
+    extension.serverSideApply(testResource());
+
+    await()
+        .untilAsserted(
+            () -> {
+              assertThat(reconciler.isResourceEvent()).isTrue();
+              assertThat(getResource().hasFinalizer(FINALIZER)).isTrue();
+            });
+
+    extension.delete(getResource());
+
+    await()
+        .untilAsserted(
+            () -> {
+              var r = getResource();
+              assertThat(r).isNull();
+              assertThat(reconciler.isDeleteEvent()).isTrue();
+              assertThat(reconciler.isEventOnMarkedForDeletion()).isTrue();
+            });
+  }
+
+  AllEventCustomResource getResource() {
+    return extension.get(AllEventCustomResource.class, TEST);
+  }
+
+  AllEventCustomResource testResource() {
+    var res = new AllEventCustomResource();
+    res.setMetadata(new ObjectMetaBuilder().withName(TEST).build());
+    return res;
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/cleaner/AllEventCleanerReconciler.java

@@ -0,0 +1,54 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.cleaner;
+
+import io.javaoperatorsdk.operator.api.config.ControllerMode;
+import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
+import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
+import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.baseapi.alleventmode.AbstractAllEventReconciler;
+
+@ControllerConfiguration(mode = ControllerMode.RECONCILE_ALL_EVENT)
+public class AllEventCleanerReconciler extends AbstractAllEventReconciler
+    implements Reconciler<AllEventCleanerCustomResource>, Cleaner<AllEventCleanerCustomResource> {
+
+  @Override
+  public UpdateControl<AllEventCleanerCustomResource> reconcile(
+      AllEventCleanerCustomResource resource, Context<AllEventCleanerCustomResource> context) {
+
+    increaseEventCount();
+    if (!resource.isMarkedForDeletion()) {
+      setResourceEvent(true);
+    }
+
+    if (!resource.hasFinalizer(FINALIZER)) {
+      resource.addFinalizer(FINALIZER);
+      context.getClient().resource(resource).update();
+      return UpdateControl.noUpdate();
+    }
+
+    return UpdateControl.noUpdate();
+  }
+
+  @Override
+  public DeleteControl cleanup(
+      AllEventCleanerCustomResource resource, Context<AllEventCleanerCustomResource> context)
+      throws Exception {
+
+    increaseEventCount();
+    if (resource.isMarkedForDeletion() && !context.isDeleteEventPresent()) {
+      setEventOnMarkedForDeletion(true);
+      if (resource.hasFinalizer(FINALIZER)) {
+        resource.removeFinalizer(FINALIZER);
+        context.getClient().resource(resource).update();
+      }
+    }
+
+    if (context.isDeleteEventPresent()) {
+      setDeleteEvent(true);
+    }
+    // todo handle this document
+    return DeleteControl.defaultDelete();
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/cleaner/AllEventCleanerSpec.java

@@ -0,0 +1,14 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.cleaner;
+
+public class AllEventCleanerSpec {
+
+  private String value;
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/cleanerfinalizer/AllEventCleanerFinalizerIT.java

@@ -18,11 +18,12 @@ public class AllEventIT {
   LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder().withReconciler(new AllEventReconciler()).build();
 
+  // todo additional finalizer
+  // todo retry
   @Test
   void eventsPresent() {
     var reconciler = extension.getReconcilerOfType(AllEventReconciler.class);
     extension.serverSideApply(testResource());
-
     await()
         .untilAsserted(
             () -> {