todo fixes

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceDiscriminator.java

@@ -4,8 +4,6 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
-// todo is discriminator a good name? it not just discriminates but also reads from cache
-// todo discuss a List version of this (for reconciler but also for batch processing?)
 public interface ResourceDiscriminator<R, P extends HasMetadata> {
 
   Optional<R> distinguish(Class<R> resource, P primary, Context<P> context);

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

@@ -24,7 +24,6 @@ public abstract class AbstractDependentResource<R, P extends HasMetadata>
   protected Creator<R, P> creator;
   protected Updater<R, P> updater;
 
-  // todo discuss, rather implement this as interface?
   private ResourceDiscriminator<R, P> resourceDiscriminator;
 
   @SuppressWarnings("unchecked")
@@ -134,14 +133,12 @@ protected R desired(P primary, Context<P> context) {
         "desired method must be implemented if this DependentResource can be created and/or updated");
   }
 
-  // todo review & refactor configuration to cover all cases
-  public ResourceDiscriminator<R, P> getResourceDiscriminator() {
-    return resourceDiscriminator;
-  }
-
-  public AbstractDependentResource<R, P> setResourceDiscriminator(
+  public void setResourceDiscriminator(
       ResourceDiscriminator<R, P> resourceDiscriminator) {
     this.resourceDiscriminator = resourceDiscriminator;
-    return this;
+  }
+
+  public ResourceDiscriminator<R, P> getResourceDiscriminator() {
+    return resourceDiscriminator;
   }
 }

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

@@ -13,8 +13,10 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
+import io.javaoperatorsdk.operator.processing.dependent.AbstractDependentResource;
 
 @SuppressWarnings("rawtypes")
 public class WorkflowCleanupExecutor<P extends HasMetadata> {
@@ -105,14 +107,12 @@ public void run() {
           deleteCalled.add(dependentResourceNode);
         }
         alreadyVisited.add(dependentResourceNode);
+
         boolean deletePostConditionMet =
-            deletePostCondition.map(c -> c.isMet(primary,
-                // todo pass also discriminator
-                context
-                    .getSecondaryResource(
-                        dependentResourceNode.getDependentResource().resourceType())
-                    .orElse(null),
-                context)).orElse(true);
+            deletePostCondition
+                .map(c -> c.isMet(primary, getSecondaryResource(dependentResourceNode),
+                    context))
+                .orElse(true);
         if (deletePostConditionMet) {
           handleDependentCleaned(dependentResourceNode);
         } else {
@@ -126,6 +126,25 @@ public void run() {
     }
   }
 
+  @SuppressWarnings("unchecked")
+  private <R> R getSecondaryResource(DependentResourceNode<R, P> dependentResourceNode) {
+    if (dependentResourceNode.getDependentResource() instanceof AbstractDependentResource &&
+        ((AbstractDependentResource) dependentResourceNode.getDependentResource())
+            .getResourceDiscriminator() != null) {
+      ResourceDiscriminator<R, P> discriminator =
+          ((AbstractDependentResource) dependentResourceNode.getDependentResource())
+              .getResourceDiscriminator();
+      return context
+          .getSecondaryResource(dependentResourceNode.getDependentResource().resourceType(),
+              discriminator)
+          .orElse(null);
+    } else {
+      return context
+          .getSecondaryResource(dependentResourceNode.getDependentResource().resourceType())
+          .orElse(null);
+    }
+  }
+
   private synchronized void handleDependentCleaned(
       DependentResourceNode<?, P> dependentResourceNode) {
     var dependOns = dependentResourceNode.getDependsOn();

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

@@ -13,10 +13,12 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
+import io.javaoperatorsdk.operator.processing.dependent.AbstractDependentResource;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
@@ -85,10 +87,7 @@ private synchronized <R> void handleReconcile(DependentResourceNode<R, P> depend
     }
 
     boolean reconcileConditionMet = dependentResourceNode.getReconcilePrecondition()
-        .map(rc -> rc.isMet(primary,
-            context
-                .getSecondaryResource(dependentResourceNode.getDependentResource().resourceType())
-                .orElse(null),
+        .map(rc -> rc.isMet(primary, getSecondaryResource(dependentResourceNode),
             context))
         .orElse(true);
 
@@ -102,6 +101,25 @@ private synchronized <R> void handleReconcile(DependentResourceNode<R, P> depend
     }
   }
 
+  @SuppressWarnings("unchecked")
+  private <R> R getSecondaryResource(DependentResourceNode<R, P> dependentResourceNode) {
+    if (dependentResourceNode.getDependentResource() instanceof AbstractDependentResource &&
+        ((AbstractDependentResource) dependentResourceNode.getDependentResource())
+            .getResourceDiscriminator() != null) {
+      ResourceDiscriminator<R, P> discriminator =
+          ((AbstractDependentResource) dependentResourceNode.getDependentResource())
+              .getResourceDiscriminator();
+      return context
+          .getSecondaryResource(dependentResourceNode.getDependentResource().resourceType(),
+              discriminator)
+          .orElse(null);
+    } else {
+      return context
+          .getSecondaryResource(dependentResourceNode.getDependentResource().resourceType())
+          .orElse(null);
+    }
+  }
+
   private synchronized void handleDelete(DependentResourceNode dependentResourceNode) {
     log.debug("Submitting for delete: {}", dependentResourceNode);