Working integration test

csviri · csviri · commit 873119197bdb · 2025-08-21T15:39:36.000+02:00
Signed-off-by: Attila Mészáros &lt;a_meszaros@apple.com&gt;
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java
@@ -304,7 +304,7 @@ private <P extends HasMetadata> ResolvedControllerConfiguration<P> controllerCon
     final var dependentFieldManager =
         fieldManager.equals(CONTROLLER_NAME_AS_FIELD_MANAGER) ? name : fieldManager;
 
-    var controllerMode = annotation == null ? ControllerMode.DEFAULT : annotation.controllerMode();
+    var controllerMode = annotation == null ? ControllerMode.DEFAULT : annotation.mode();
 
     InformerConfiguration<P> informerConfig =
         InformerConfiguration.builder(resourceClass)
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java
@@ -93,11 +93,11 @@ default String fieldManager() {
 
   <C> C getConfigurationFor(DependentResourceSpec<?, P, C> spec);
 
-  default ControllerMode getControllerMode() {
+  default ControllerMode mode() {
     return ControllerMode.DEFAULT;
   }
 
   default boolean isAllEventReconcileMode() {
-    return getControllerMode() == ControllerMode.ALL_EVENT_RECONCILE;
+    return mode() == ControllerMode.RECONCILE_ALL_EVENT;
   }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java
@@ -30,7 +30,7 @@ public class ControllerConfigurationOverrider<R extends HasMetadata> {
   private Duration reconciliationMaxInterval;
   private Map<DependentResourceSpec, Object> configurations;
   private final InformerConfiguration<R>.Builder config;
-  private ControllerMode controllerMode;
+  private ControllerMode mode;
 
   private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
     this.finalizer = original.getFinalizerName();
@@ -43,7 +43,7 @@ private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
     this.rateLimiter = original.getRateLimiter();
     this.name = original.getName();
     this.fieldManager = original.fieldManager();
-    this.controllerMode = original.getControllerMode();
+    this.mode = original.mode();
   }
 
   public ControllerConfigurationOverrider<R> withFinalizer(String finalizer) {
@@ -156,8 +156,8 @@ public ControllerConfigurationOverrider<R> withFieldManager(String dependentFiel
     return this;
   }
 
-  public ControllerConfigurationOverrider<R> withControllerMode(ControllerMode controllerMode) {
-    this.controllerMode = controllerMode;
+  public ControllerConfigurationOverrider<R> withMode(ControllerMode controllerMode) {
+    this.mode = controllerMode;
     return this;
   }
 
@@ -205,7 +205,7 @@ public ControllerConfiguration<R> build() {
         fieldManager,
         original.getConfigurationService(),
         config.buildForController(),
-        controllerMode,
+        mode,
         original.getWorkflowSpec().orElse(null));
   }
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerMode.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerMode.java
@@ -2,5 +2,5 @@
 
 public enum ControllerMode {
   DEFAULT,
-  ALL_EVENT_RECONCILE
+  RECONCILE_ALL_EVENT
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
@@ -45,7 +45,7 @@ public ResolvedControllerConfiguration(ControllerConfiguration<P> other) {
         other.fieldManager(),
         other.getConfigurationService(),
         other.getInformerConfig(),
-        other.getControllerMode(),
+        other.mode(),
         other.getWorkflowSpec().orElse(null));
   }
 
@@ -216,7 +216,7 @@ public String fieldManager() {
   }
 
   @Override
-  public ControllerMode getControllerMode() {
+  public ControllerMode mode() {
     return controllerMode;
   }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ControllerConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ControllerConfiguration.java
@@ -79,5 +79,5 @@ MaxReconciliationInterval maxReconciliationInterval() default
    */
   String fieldManager() default CONTROLLER_NAME_AS_FIELD_MANAGER;
 
-  ControllerMode controllerMode() default ControllerMode.DEFAULT;
+  ControllerMode mode() default ControllerMode.DEFAULT;
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java
@@ -136,7 +136,8 @@ private void submitReconciliationExecution(ResourceState state) {
       final var resourceID = state.getId();
       Optional<P> maybeLatest = cache.get(resourceID);
       maybeLatest.ifPresent(MDCUtils::addResourceInfo);
-      if (!controllerUnderExecution && maybeLatest.isPresent()) {
+      if (!controllerUnderExecution
+          && (maybeLatest.isPresent() || (isAllEventMode() && state.deleteEventPresent()))) {
         var rateLimit = state.getRateLimit();
         if (rateLimit == null) {
           rateLimit = rateLimiter.initState();
@@ -148,7 +149,7 @@ private void submitReconciliationExecution(ResourceState state) {
           return;
         }
         state.setUnderProcessing(true);
-        final var latest = maybeLatest.get();
+        final var latest = maybeLatest.orElseGet(() -> getResourceFromState(state));
         ExecutionScope<P> executionScope = new ExecutionScope<>(state.getRetry());
         state.unMarkEventReceived(isAllEventMode());
         metrics.reconcileCustomResource(latest, state.getRetry(), metricsMetadata);
@@ -175,6 +176,17 @@ private void submitReconciliationExecution(ResourceState state) {
     }
   }
 
+  @SuppressWarnings("unchecked")
+  private P getResourceFromState(ResourceState state) {
+    if (isAllEventMode()) {
+      log.debug("Getting resource from state for {}", state.getId());
+      return (P) state.getLastKnownResource();
+    } else {
+      throw new IllegalStateException(
+          "No resource found, this indicates issue with implementation.");
+    }
+  }
+
   private void handleEventMarking(Event event, ResourceState state) {
     final var relatedCustomResourceID = event.getRelatedCustomResourceID();
     if (event instanceof ResourceEvent resourceEvent) {
@@ -258,7 +270,7 @@ synchronized void eventProcessingFinished(
       state.markProcessedMarkForDeletion();
       metrics.cleanupDoneFor(resourceID, metricsMetadata);
     } else {
-      if (state.eventPresent()) {
+      if (state.eventPresent() || (isAllEventMode() && state.deleteEventPresent())) {
         submitReconciliationExecution(state);
       } else {
         reScheduleExecutionIfInstructed(postExecutionControl, executionScope.getResource());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/AbstractAllEventReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/AbstractAllEventReconciler.java
@@ -0,0 +1,45 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class AbstractAllEventReconciler {
+
+  public static final String FINALIZER = "all.event.mode/finalizer";
+
+  private boolean resourceEvent = false;
+  private boolean deleteEvent = false;
+  private boolean eventOnMarkedForDeletion = false;
+  private AtomicInteger eventCounter = new AtomicInteger(0);
+
+  public boolean isResourceEvent() {
+    return resourceEvent;
+  }
+
+  public void setResourceEvent(boolean resourceEvent) {
+    this.resourceEvent = resourceEvent;
+  }
+
+  public boolean isDeleteEvent() {
+    return deleteEvent;
+  }
+
+  public void setDeleteEvent(boolean deleteEvent) {
+    this.deleteEvent = deleteEvent;
+  }
+
+  public boolean isEventOnMarkedForDeletion() {
+    return eventOnMarkedForDeletion;
+  }
+
+  public void setEventOnMarkedForDeletion(boolean eventOnMarkedForDeletion) {
+    this.eventOnMarkedForDeletion = eventOnMarkedForDeletion;
+  }
+
+  public int getEventCounter() {
+    return eventCounter.get();
+  }
+
+  public void increaseEventCount() {
+    eventCounter.incrementAndGet();
+  }
+}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/cleaner/AllEventCleanerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/cleaner/AllEventCleanerIT.java
@@ -0,0 +1,3 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.cleaner;
+
+public class AllEventCleanerIT {}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/cleanerfinalizer/AllEventCleanerFinalizerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/cleanerfinalizer/AllEventCleanerFinalizerIT.java
@@ -0,0 +1,3 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.cleanerfinalizer;
+
+public class AllEventCleanerFinalizerIT {}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/finalizer/AllEventFinalizerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/finalizer/AllEventFinalizerIT.java
@@ -0,0 +1,3 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.finalizer;
+
+public class AllEventFinalizerIT {}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventCustomResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventCustomResource.java
@@ -0,0 +1,13 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.onlyreconcile;
+
+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("aecs")
+public class AllEventCustomResource extends CustomResource<AllEventSpec, Void>
+    implements Namespaced {}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventIT.java
@@ -0,0 +1,54 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.onlyreconcile;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+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 AllEventIT {
+
+  public static final String TEST = "test1";
+
+  @RegisterExtension
+  LocallyRunOperatorExtension extension =
+      LocallyRunOperatorExtension.builder().withReconciler(new AllEventReconciler()).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;
+  }
+}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventReconciler.java
@@ -0,0 +1,44 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.onlyreconcile;
+
+import io.javaoperatorsdk.operator.api.config.ControllerMode;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+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 AllEventReconciler extends AbstractAllEventReconciler
+    implements Reconciler<AllEventCustomResource> {
+
+  @Override
+  public UpdateControl<AllEventCustomResource> reconcile(
+      AllEventCustomResource resource, Context<AllEventCustomResource> context) {
+
+    increaseEventCount();
+
+    if (!resource.isMarkedForDeletion()) {
+      setResourceEvent(true);
+    }
+
+    if (!resource.hasFinalizer(FINALIZER)) {
+      resource.addFinalizer(FINALIZER);
+      context.getClient().resource(resource).update();
+      return UpdateControl.noUpdate();
+    }
+
+    if (resource.isMarkedForDeletion() && !context.isDeleteEventPresent()) {
+      setEventOnMarkedForDeletion(true);
+      if (resource.hasFinalizer(FINALIZER)) {
+        resource.removeFinalizer(FINALIZER);
+        context.getClient().resource(resource).update();
+      }
+    }
+
+    if (context.isDeleteEventPresent()) {
+      setDeleteEvent(true);
+    }
+
+    return UpdateControl.noUpdate();
+  }
+}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventSpec.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/alleventmode/onlyreconcile/AllEventSpec.java
@@ -0,0 +1,14 @@
+package io.javaoperatorsdk.operator.baseapi.alleventmode.onlyreconcile;
+
+public class AllEventSpec {
+
+  private String value;
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,11 @@ default String fieldManager() {`
`93`	`93`
`94`	`94`	`<C> C getConfigurationFor(DependentResourceSpec<?, P, C> spec);`
`95`	`95`
`96`		`- default ControllerMode getControllerMode() {`
	`96`	`+ default ControllerMode mode() {`
`97`	`97`	`return ControllerMode.DEFAULT;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`default boolean isAllEventReconcileMode() {`
`101`		`- return getControllerMode() == ControllerMode.ALL_EVENT_RECONCILE;`
	`101`	`+ return mode() == ControllerMode.RECONCILE_ALL_EVENT;`
`102`	`102`	`}`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`public enum ControllerMode {`
`4`	`4`	`DEFAULT,`
`5`		`- ALL_EVENT_RECONCILE`
	`5`	`+ RECONCILE_ALL_EVENT`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public ResolvedControllerConfiguration(ControllerConfiguration<P> other) {`
`45`	`45`	`other.fieldManager(),`
`46`	`46`	`other.getConfigurationService(),`
`47`	`47`	`other.getInformerConfig(),`
`48`		`- other.getControllerMode(),`
	`48`	`+ other.mode(),`
`49`	`49`	`other.getWorkflowSpec().orElse(null));`
`50`	`50`	`}`
`51`	`51`
`@@ -216,7 +216,7 @@ public String fieldManager() {`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`@Override`
`219`		`- public ControllerMode getControllerMode() {`
	`219`	`+ public ControllerMode mode() {`
`220`	`220`	`return controllerMode;`
`221`	`221`	`}`
`222`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,5 @@ MaxReconciliationInterval maxReconciliationInterval() default`
`79`	`79`	`*/`
`80`	`80`	`String fieldManager() default CONTROLLER_NAME_AS_FIELD_MANAGER;`
`81`	`81`
`82`		`- ControllerMode controllerMode() default ControllerMode.DEFAULT;`
	`82`	`+ ControllerMode mode() default ControllerMode.DEFAULT;`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package io.javaoperatorsdk.operator.baseapi.alleventmode.cleaner;`
	`2`	`+`
	`3`	`+public class AllEventCleanerIT {}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package io.javaoperatorsdk.operator.baseapi.alleventmode.cleanerfinalizer;`
	`2`	`+`
	`3`	`+public class AllEventCleanerFinalizerIT {}`