kubernetes dependent resource configuration

Author: csviri

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

@@ -17,16 +17,14 @@
 import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
-import io.javaoperatorsdk.operator.api.reconciler.Constants;
+import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
-import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.VoidCondition;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilter;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilters;
@@ -264,9 +262,9 @@ public List<DependentResourceSpec> getDependentResources() {
         }
         spec = new DependentResourceSpec(dependentType, config, name,
             Set.of(dependent.dependsOn()),
-            instantiateConditionIfNotVoid(dependent.readyPostcondition()),
-            instantiateConditionIfNotVoid(dependent.reconcilePrecondition()),
-            instantiateConditionIfNotVoid(dependent.deletePostcondition()));
+            instantiateIfNotVoid(dependent.readyPostcondition(), VoidCondition.class),
+            instantiateIfNotVoid(dependent.reconcilePrecondition(), VoidCondition.class),
+            instantiateIfNotVoid(dependent.deletePostcondition(), VoidCondition.class));
         specsMap.put(name, spec);
       }
 
@@ -275,8 +273,8 @@ public List<DependentResourceSpec> getDependentResources() {
     return specs;
   }
 
-  private Condition<?, ?> instantiateConditionIfNotVoid(Class<? extends Condition> condition) {
-    if (condition != VoidCondition.class) {
+  private <T> T instantiateIfNotVoid(Class<T> condition, Class<?> voidClass) {
+    if (!condition.equals(voidClass)) {
       try {
         return condition.getDeclaredConstructor().newInstance();
       } catch (InstantiationException
@@ -310,6 +308,7 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
     OnUpdateFilter<? extends HasMetadata> onUpdateFilter = null;
     OnDeleteFilter<? extends HasMetadata> onDeleteFilter = null;
     GenericFilter<? extends HasMetadata> genericFilter = null;
+    ResourceDiscriminator<?, ? extends HasMetadata> resourceDiscriminator = null;
     if (kubeDependent != null) {
       if (!Arrays.equals(KubernetesDependent.DEFAULT_NAMESPACES,
           kubeDependent.namespaces())) {
@@ -332,10 +331,14 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
       genericFilter =
           createFilter(kubeDependent.genericFilter(), FilterType.generic, kubeDependentName)
               .orElse(null);
+
+      resourceDiscriminator = instantiateIfNotVoid(kubeDependent.resourceDiscriminator(),
+          VoidResourceDiscriminator.class);
     }
 
     config =
-        new KubernetesDependentResourceConfig(namespaces, labelSelector, configuredNS, onAddFilter,
+        new KubernetesDependentResourceConfig(namespaces, labelSelector, configuredNS,
+            resourceDiscriminator, onAddFilter,
             onUpdateFilter, onDeleteFilter, genericFilter);
 
     return config;

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

@@ -0,0 +1,16 @@
+package io.javaoperatorsdk.operator.api.reconciler;
+
+import java.util.Optional;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
+
+public class VoidResourceDiscriminator<R, P extends HasMetadata>
+    implements ResourceDiscriminator<R, P> {
+
+  @Override
+  public Optional<R> distinguish(Class<R> resource, Context<P> context,
+      EventSourceRetriever<P> eventSourceManager) {
+    throw new UnsupportedOperationException();
+  }
+}

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

@@ -8,6 +8,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.Ignore;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
@@ -23,6 +24,8 @@ public abstract class AbstractDependentResource<R, P extends HasMetadata>
   protected Creator<R, P> creator;
   protected Updater<R, P> updater;
 
+  private ResourceDiscriminator<R, P> resourceDiscriminator;
+
   @SuppressWarnings("unchecked")
   public AbstractDependentResource() {
     creator = creatable ? (Creator<R, P>) this : null;
@@ -66,7 +69,11 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
   }
 
   protected Optional<R> getSecondaryResource(P primary, Context<P> context) {
-    return context.getSecondaryResource(resourceType());
+    if (resourceDiscriminator == null) {
+      return context.getSecondaryResource(resourceType());
+    } else {
+      return context.getSecondaryResource(resourceType(), resourceDiscriminator);
+    }
   }
 
   private void throwIfNull(R desired, P primary, String descriptor) {
@@ -125,4 +132,14 @@ protected R desired(P primary, Context<P> context) {
     throw new IllegalStateException(
         "desired method must be implemented if this DependentResource can be created and/or updated");
   }
+
+  protected ResourceDiscriminator<R, P> getResourceDiscriminator() {
+    return resourceDiscriminator;
+  }
+
+  protected AbstractDependentResource<R, P> setResourceDiscriminator(
+      ResourceDiscriminator<R, P> resourceDiscriminator) {
+    this.resourceDiscriminator = resourceDiscriminator;
+    return this;
+  }
 }

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

@@ -7,6 +7,8 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
+import io.javaoperatorsdk.operator.api.reconciler.VoidResourceDiscriminator;
 import io.javaoperatorsdk.operator.processing.event.source.filter.*;
 
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET;
@@ -42,4 +44,6 @@
   Class<? extends OnDeleteFilter<? extends HasMetadata>> onDeleteFilter() default VoidOnDeleteFilter.class;
 
   Class<? extends GenericFilter<? extends HasMetadata>> genericFilter() default VoidGenericFilter.class;
+
+  Class<? extends ResourceDiscriminator> resourceDiscriminator() default VoidResourceDiscriminator.class;
 }

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

@@ -166,6 +166,7 @@ protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> cont
       onUpdateFilter = kubernetesDependentResourceConfig.onUpdateFilter();
       onDeleteFilter = kubernetesDependentResourceConfig.onDeleteFilter();
       genericFilter = kubernetesDependentResourceConfig.genericFilter();
+      setResourceDiscriminator(kubernetesDependentResourceConfig.getResourceDiscriminator());
 
       configureWith(kubernetesDependentResourceConfig.labelSelector(),
           kubernetesDependentResourceConfig.namespaces(),

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

@@ -3,6 +3,7 @@
 import java.util.Set;
 
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
 import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnDeleteFilter;
@@ -15,7 +16,7 @@ public class KubernetesDependentResourceConfig<R> {
   private Set<String> namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
   private String labelSelector = NO_VALUE_SET;
   private boolean namespacesWereConfigured = false;
-
+  private ResourceDiscriminator<R, ?> resourceDiscriminator;
 
   private OnAddFilter<R> onAddFilter;
 
@@ -29,7 +30,8 @@ public KubernetesDependentResourceConfig() {}
 
   @SuppressWarnings("rawtypes")
   public KubernetesDependentResourceConfig(Set<String> namespaces, String labelSelector,
-      boolean configuredNS, OnAddFilter<R> onAddFilter,
+      boolean configuredNS, ResourceDiscriminator<R, ?> resourceDiscriminator,
+      OnAddFilter<R> onAddFilter,
       OnUpdateFilter<R> onUpdateFilter,
       OnDeleteFilter<R> onDeleteFilter, GenericFilter<R> genericFilter) {
     this.namespaces = namespaces;
@@ -42,7 +44,7 @@ public KubernetesDependentResourceConfig(Set<String> namespaces, String labelSel
   }
 
   public KubernetesDependentResourceConfig(Set<String> namespaces, String labelSelector) {
-    this(namespaces, labelSelector, true, null, null, null, null);
+    this(namespaces, labelSelector, true, null, null, null, null, null);
   }
 
   public KubernetesDependentResourceConfig<R> setNamespaces(Set<String> namespaces) {
@@ -73,17 +75,22 @@ public OnAddFilter onAddFilter() {
     return onAddFilter;
   }
 
-  @SuppressWarnings("rawtypes")
-  public OnUpdateFilter onUpdateFilter() {
+
+  public OnUpdateFilter<R> onUpdateFilter() {
     return onUpdateFilter;
   }
 
   @SuppressWarnings("rawtypes")
-  public OnDeleteFilter onDeleteFilter() {
+  public OnDeleteFilter<R> onDeleteFilter() {
     return onDeleteFilter;
   }
 
   public GenericFilter<R> genericFilter() {
     return genericFilter;
   }
+
+  @SuppressWarnings("rawtypes")
+  public ResourceDiscriminator getResourceDiscriminator() {
+    return resourceDiscriminator;
+  }
 }