IT fix

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/AnnotationControllerConfiguration.java

@@ -273,10 +273,10 @@ public List<DependentResourceSpec> getDependentResources() {
     return specs;
   }
 
-  private <T> T instantiateIfNotVoid(Class<T> condition, Class<?> voidClass) {
-    if (!condition.equals(voidClass)) {
+  private <T> T instantiateIfNotVoid(Class<T> clazz, Class<?> voidClass) {
+    if (!clazz.equals(voidClass)) {
       try {
-        return condition.getDeclaredConstructor().newInstance();
+        return clazz.getDeclaredConstructor().newInstance();
       } catch (InstantiationException
           | IllegalAccessException
           | InvocationTargetException

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

@@ -47,11 +47,11 @@ public <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventS
         .getSecondaryResource(primaryResource);
   }
 
-  // todo implement
   @Override
   public <R> Optional<R> getSecondaryResource(Class<R> expectedType,
       ResourceDiscriminator<R, P> discriminator) {
-    return Optional.empty();
+    return discriminator.distinguish(expectedType, primaryResource, this,
+        controller.getEventSourceManager());
   }
 
   @Override

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

@@ -8,7 +8,7 @@
 // todo is discriminator a good name? it not just discriminates but also reads from cache
 public interface ResourceDiscriminator<R, P extends HasMetadata> {
 
-  Optional<R> distinguish(Class<R> resource, Context<P> context,
+  Optional<R> distinguish(Class<R> resource, P primary, Context<P> context,
       EventSourceRetriever<P> eventSourceManager);
 
 }

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

@@ -6,14 +6,15 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 
+// todo this requires rather a matcher (name+namespace) as input
 public abstract class ResourceListDiscriminator<R, P extends HasMetadata>
     implements ResourceDiscriminator<R, P> {
   @Override
-  public Optional<R> distinguish(Class<R> resource, Context<P> context,
+  public Optional<R> distinguish(Class<R> resource, P primary, Context<P> context,
       EventSourceRetriever<P> eventSourceManager) {
     var resources = context.getSecondaryResources(resource);
-    return distinguish(resources);
+    return distinguish(primary, resources);
   }
 
-  abstract Optional<R> distinguish(Set<R> resourceList);
+  protected abstract Optional<R> distinguish(P primary, Set<R> resourceList);
 }

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

@@ -9,7 +9,7 @@ public class VoidResourceDiscriminator<R, P extends HasMetadata>
     implements ResourceDiscriminator<R, P> {
 
   @Override
-  public Optional<R> distinguish(Class<R> resource, Context<P> context,
+  public Optional<R> distinguish(Class<R> resource, P primary, Context<P> context,
       EventSourceRetriever<P> eventSourceManager) {
     throw new UnsupportedOperationException();
   }

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

@@ -24,6 +24,7 @@ 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")

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

@@ -41,6 +41,7 @@ public KubernetesDependentResourceConfig(Set<String> namespaces, String labelSel
     this.onUpdateFilter = onUpdateFilter;
     this.onDeleteFilter = onDeleteFilter;
     this.genericFilter = genericFilter;
+    this.resourceDiscriminator = resourceDiscriminator;
   }
 
   public KubernetesDependentResourceConfig(Set<String> namespaces, String labelSelector) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource1.java

@@ -2,15 +2,19 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceListDiscriminator;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 
-@KubernetesDependent(labelSelector = "dependent = cm1")
+@KubernetesDependent(labelSelector = "dependent = cm1",
+    resourceDiscriminator = ConfigMapDependentResource1.CM1ResourceDiscriminator.class)
 public class ConfigMapDependentResource1 extends
     CRUDKubernetesDependentResource<ConfigMap, OrderedManagedDependentCustomResource> {
 
@@ -42,4 +46,14 @@ protected ConfigMap desired(OrderedManagedDependentCustomResource primary,
     return configMap;
   }
 
+  public static class CM1ResourceDiscriminator
+      extends ResourceListDiscriminator<ConfigMap, OrderedManagedDependentCustomResource> {
+    @Override
+    protected Optional<ConfigMap> distinguish(OrderedManagedDependentCustomResource primary,
+        Set<ConfigMap> resourceList) {
+      return resourceList.stream().filter(cm -> cm.getMetadata().getName()
+          .equals(primary.getMetadata().getName() + "1")).findFirst();
+    }
+  }
+
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource2.java

@@ -2,15 +2,19 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceListDiscriminator;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 
-@KubernetesDependent(labelSelector = "dependent = cm2")
+@KubernetesDependent(labelSelector = "dependent = cm2",
+    resourceDiscriminator = ConfigMapDependentResource2.CM2ResourceDiscriminator.class)
 public class ConfigMapDependentResource2 extends
     CRUDKubernetesDependentResource<ConfigMap, OrderedManagedDependentCustomResource> {
 
@@ -42,4 +46,14 @@ protected ConfigMap desired(OrderedManagedDependentCustomResource primary,
     return configMap;
   }
 
+  public static class CM2ResourceDiscriminator
+      extends ResourceListDiscriminator<ConfigMap, OrderedManagedDependentCustomResource> {
+    @Override
+    protected Optional<ConfigMap> distinguish(OrderedManagedDependentCustomResource primary,
+        Set<ConfigMap> resourceList) {
+      return resourceList.stream().filter(cm -> cm.getMetadata().getName()
+          .equals(primary.getMetadata().getName() + "2")).findFirst();
+    }
+  }
+
 }