fix: register event source when dependents are marked for deletion

Fixes #3249

Signed-off-by: Chris Laprun <metacosm@gmail.com>

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutor.java

@@ -246,6 +246,10 @@ private void markDependentsForDelete(
     // so if the activation condition was false, this node is not meant to be deleted.
     var dependents = dependentResourceNode.getParents();
     if (activationConditionMet) {
+      // make sure we register the dependent's event source if it hasn't been added already
+      // this might be needed in corner cases such as
+      // https://github.com/operator-framework/java-operator-sdk/issues/3249
+      registerOrDeregisterEventSourceBasedOnActivation(true, dependentResourceNode);
       createOrGetResultFor(dependentResourceNode).markForDelete();
       if (dependents.isEmpty()) {
         bottomNodes.add(dependentResourceNode);

operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/bulkactivationcondition/BulkActivationConditionIT.java

@@ -18,14 +18,12 @@
 import java.time.Duration;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.javaoperatorsdk.annotation.Sample;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
-import io.javaoperatorsdk.operator.processing.event.NoEventSourceForClassException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
@@ -49,7 +47,6 @@
  *
  * <p>This test FAILS on unfixed JOSDK, demonstrating the bug.
  */
-@Disabled("Reproducer for https://github.com/operator-framework/java-operator-sdk/issues/3249")
 @Sample(
     tldr = "Bulk Dependent Resource with Activation Condition Bug Reproducer",
     description =
@@ -84,25 +81,11 @@ void nodeDeleteExecutorShouldNotThrowWhenEventSourceNotYetRegistered() {
             .build());
     extension.create(primary);
 
-    // Wait for reconcile() or updateErrorStatus() to be called — whichever comes first.
-    // If the bug is present, updateErrorStatus() fires (no reconcile() call); if fixed,
-    // reconcile() runs cleanly.
-    await().atMost(Duration.ofSeconds(30)).until(() -> reconciler.callCount.get() > 0);
+    // Wait for reconcile() to be called.
+    // If the bug is present, SecretBulkDependentResource will be in error and lastError will be set
+    await().atMost(Duration.ofSeconds(10)).until(() -> reconciler.callCount.get() == 1);
 
     // On unfixed JOSDK this fails: lastError contains NoEventSourceForClassException.
-    assertThat(reconciler.lastError.get())
-        .as(
-            "NodeDeleteExecutor must not throw NoEventSourceForClassException when the"
-                + " activationCondition-gated event source was never registered")
-        .satisfies(
-            e -> {
-              Throwable t = e;
-              while (t != null) {
-                assertThat(t)
-                    .as("Cause chain should not contain NoEventSourceForClassException")
-                    .isNotInstanceOf(NoEventSourceForClassException.class);
-                t = t.getCause();
-              }
-            });
+    assertThat(reconciler.lastError.get()).isNull();
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/bulkactivationcondition/BulkActivationConditionReconciler.java

@@ -20,6 +20,7 @@
 
 import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
+import io.javaoperatorsdk.operator.processing.retry.GradualRetry;
 
 /**
  * Workflow:
@@ -40,11 +41,14 @@
           type = ConfigMapDependentResource.class,
           reconcilePrecondition = AlwaysFailingPrecondition.class),
       @Dependent(
+          name = SecretBulkDependentResource.NAME,
           type = SecretBulkDependentResource.class,
           activationCondition = AlwaysTrueActivation.class,
           dependsOn = "configmap")
-    })
-@ControllerConfiguration
+    },
+    handleExceptionsInReconciler = true)
+@GradualRetry(maxAttempts = 0)
+@ControllerConfiguration(maxReconciliationInterval = @MaxReconciliationInterval(interval = 0))
 public class BulkActivationConditionReconciler
     implements Reconciler<BulkActivationConditionCustomResource> {
 
@@ -58,17 +62,21 @@ public class BulkActivationConditionReconciler
   public UpdateControl<BulkActivationConditionCustomResource> reconcile(
       BulkActivationConditionCustomResource primary,
       Context<BulkActivationConditionCustomResource> context) {
+    final var workflowResult =
+        context
+            .managedWorkflowAndDependentResourceContext()
+            .getWorkflowReconcileResult()
+            .orElseThrow();
+    final var erroredDependents = workflowResult.getErroredDependents();
+    if (!erroredDependents.isEmpty()) {
+      final var exception =
+          erroredDependents.get(
+              workflowResult
+                  .getDependentResourceByName(SecretBulkDependentResource.NAME)
+                  .orElseThrow());
+      lastError.set(exception);
+    }
     callCount.incrementAndGet();
     return UpdateControl.noUpdate();
   }
-
-  @Override
-  public ErrorStatusUpdateControl<BulkActivationConditionCustomResource> updateErrorStatus(
-      BulkActivationConditionCustomResource primary,
-      Context<BulkActivationConditionCustomResource> context,
-      Exception e) {
-    lastError.set(e);
-    callCount.incrementAndGet();
-    return ErrorStatusUpdateControl.noStatusUpdate();
-  }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/bulkactivationcondition/SecretBulkDependentResource.java

@@ -43,8 +43,9 @@ public class SecretBulkDependentResource
     extends KubernetesDependentResource<Secret, BulkActivationConditionCustomResource>
     implements CRUDKubernetesBulkDependentResource<Secret, BulkActivationConditionCustomResource> {
 
-  public static final String LABEL_KEY = "reproducer";
-  public static final String LABEL_VALUE = "bulk-activation-condition";
+  static final String NAME = "secret";
+  static final String LABEL_KEY = "reproducer";
+  static final String LABEL_VALUE = "bulk-activation-condition";
 
   @Override
   public Map<ResourceID, Secret> desiredResources(