fix: cleanup of resources with activation condition

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

Author: csviri

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

@@ -128,4 +128,23 @@ protected <R> void submit(DependentResourceNode<R, P> dependentResourceNode,
     logger().debug("Submitted to {}: {} primaryID: {}", operation, dependentResourceNode,
         primaryID);
   }
+
+  protected <R> void registerOrDeregisterEventSourceBasedOnActivation(
+      boolean activationConditionMet,
+      DependentResourceNode<R, P> dependentResourceNode) {
+    if (dependentResourceNode.getActivationCondition().isPresent()) {
+      if (activationConditionMet) {
+        var eventSource =
+            dependentResourceNode.getDependentResource().eventSource(context.eventSourceRetriever()
+                .eventSourceContextForDynamicRegistration());
+        var es = eventSource.orElseThrow();
+        context.eventSourceRetriever()
+            .dynamicallyRegisterEventSource(dependentResourceNode.getName(), es);
+
+      } else {
+        context.eventSourceRetriever()
+            .dynamicallyDeRegisterEventSource(dependentResourceNode.getName());
+      }
+    }
+  }
 }

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

@@ -70,6 +70,7 @@ protected void doRun(DependentResourceNode<R, P> dependentResourceNode,
 
       var active =
           isConditionMet(dependentResourceNode.getActivationCondition(), dependentResource);
+      registerOrDeregisterEventSourceBasedOnActivation(active, dependentResourceNode);
 
       if (dependentResource.isDeletable() && active) {
         ((Deleter<P>) dependentResource).delete(primary, context);

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

@@ -78,24 +78,6 @@ private synchronized <R> void handleReconcile(DependentResourceNode<R, P> depend
     }
   }
 
-  private <R> void registerOrDeregisterEventSourceBasedOnActivation(boolean activationConditionMet,
-      DependentResourceNode<R, P> dependentResourceNode) {
-    if (dependentResourceNode.getActivationCondition().isPresent()) {
-      if (activationConditionMet) {
-        var eventSource =
-            dependentResourceNode.getDependentResource().eventSource(context.eventSourceRetriever()
-                .eventSourceContextForDynamicRegistration());
-        var es = eventSource.orElseThrow();
-        context.eventSourceRetriever()
-            .dynamicallyRegisterEventSource(dependentResourceNode.getName(), es);
-
-      } else {
-        context.eventSourceRetriever()
-            .dynamicallyDeRegisterEventSource(dependentResourceNode.getName());
-      }
-    }
-  }
-
   private synchronized void handleDelete(DependentResourceNode dependentResourceNode) {
     log.debug("Submitting for delete: {}", dependentResourceNode);