bulk dependent resource to an interface

Author: csviri

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

@@ -22,24 +22,25 @@ public abstract class AbstractDependentResource<R, P extends HasMetadata>
 
   protected final boolean creatable = this instanceof Creator;
   protected final boolean updatable = this instanceof Updater;
+  protected final boolean bulk = this instanceof BulkDependentResource;
 
   protected Creator<R, P> creator;
   protected Updater<R, P> updater;
+  protected BulkDependentResource<R, P> bulkDependentResource;
 
   protected List<ResourceDiscriminator<R, P>> resourceDiscriminator = new ArrayList<>(1);
-  // used just for bulk creation
-  protected BulkResourceDiscriminatorFactory<R, P> bulkResourceDiscriminatorFactory;
 
   @SuppressWarnings("unchecked")
   public AbstractDependentResource() {
     creator = creatable ? (Creator<R, P>) this : null;
     updater = updatable ? (Updater<R, P>) this : null;
+    bulkDependentResource = bulk ? (BulkDependentResource<R, P>) this : null;
   }
 
   @Override
   public ReconcileResult<R> reconcile(P primary, Context<P> context) {
-    var count = count(primary, context).orElse(1);
-    if (isBulkResourceCreation(primary, context)) {
+    var count = bulk ? bulkDependentResource.count(primary, context) : 1;
+    if (bulk) {
       cleanupBulkResourcesIfRequired(count, resourceDiscriminator.size(), primary, context);
       adjustDiscriminators(count);
     }
@@ -59,23 +60,19 @@ private void cleanupBulkResourcesIfRequired(int targetCount, int actualCount, P
     for (int i = targetCount; i < actualCount; i++) {
       var resource = getSecondaryResourceIndexAware(primary, i, context);
       var index = i;
-      resource.ifPresent(r -> {
-        deleteBulkResourceWithIndex(primary, r, index, context);
-      });
+      resource.ifPresent(
+          r -> bulkDependentResource.deleteBulkResourceWithIndex(primary, r, index, context));
     }
   }
 
-  protected void deleteBulkResourceWithIndex(P primary, R resource, int i, Context<P> context) {
-    throw new IllegalStateException("Implement if handling bulk resources.");
-  }
-
   private void adjustDiscriminators(int count) {
     if (resourceDiscriminator.size() == count) {
       return;
     }
     if (resourceDiscriminator.size() < count) {
       for (int i = resourceDiscriminator.size(); i < count; i++) {
-        resourceDiscriminator.add(bulkResourceDiscriminatorFactory.createResourceDiscriminator(i));
+        resourceDiscriminator.add(bulkDependentResource.bulkResourceDiscriminatorFactory()
+            .createResourceDiscriminator(i));
       }
     }
     if (resourceDiscriminator.size() > count) {
@@ -98,7 +95,7 @@ protected ReconcileResult<R> reconcileIndexAware(P primary, int i, Context<P> co
         final var actual = maybeActual.get();
         if (updatable) {
           final Matcher.Result<R> match;
-          if (isBulkResourceCreation(primary, context)) {
+          if (bulk) {
             match = updater.match(actual, primary, i, context);
           } else {
             match = updater.match(actual, primary, context);
@@ -124,7 +121,7 @@ protected ReconcileResult<R> reconcileIndexAware(P primary, int i, Context<P> co
   }
 
   private R desiredIndexAware(P primary, int i, Context<P> context) {
-    return isBulkResourceCreation(primary, context) ? desired(primary, i, context)
+    return bulk ? desired(primary, i, context)
         : desired(primary, context);
   }
 
@@ -142,7 +139,7 @@ protected Optional<R> getSecondaryResourceIndexAware(P primary, int index, Conte
       throw new IllegalStateException(
           "Handling resources in bulk bot no resource discriminators set.");
     }
-    if (!isBulkResourceCreation(primary, context)) {
+    if (!bulk) {
       return getSecondaryResource(primary, context);
     }
 
@@ -207,7 +204,7 @@ protected R desired(P primary, Context<P> context) {
   }
 
   protected R desired(P primary, int index, Context<P> context) {
-    if (!isBulkResourceCreation(primary, context)) {
+    if (!bulk) {
       return desired(primary, context);
     } else {
       throw new IllegalStateException(
@@ -222,30 +219,4 @@ public AbstractDependentResource<R, P> setResourceDiscriminator(
     }
     return this;
   }
-
-  /**
-   * @param primary resource
-   * @param context actual context
-   * @return empty optional if it's not a bulk resource management, number of instances otherwise.
-   */
-  protected Optional<Integer> count(P primary, Context<P> context) {
-    return Optional.empty();
-  }
-
-  /**
-   * Override in case the count() is a more heavy
-   */
-  protected boolean isBulkResourceCreation(P primary, Context<P> context) {
-    return count(primary, context).isPresent();
-  }
-
-  public BulkResourceDiscriminatorFactory<R, P> getBulkResourceDiscriminatorFactory() {
-    return bulkResourceDiscriminatorFactory;
-  }
-
-  public AbstractDependentResource<R, P> setBulkResourceDiscriminatorFactory(
-      BulkResourceDiscriminatorFactory<R, P> bulkResourceDiscriminatorFactory) {
-    this.bulkResourceDiscriminatorFactory = bulkResourceDiscriminatorFactory;
-    return this;
-  }
 }

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

@@ -0,0 +1,18 @@
+package io.javaoperatorsdk.operator.processing.dependent;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+
+public interface BulkDependentResource<R, P extends HasMetadata> {
+
+  int count(P primary, Context<P> context);
+
+  default R desired(P primary, int index, Context<P> context) {
+    throw new IllegalStateException("Implement if the dependent resource is a creator or updater");
+  }
+
+  void deleteBulkResourceWithIndex(P primary, R resource, int i, Context<P> context);
+
+  BulkResourceDiscriminatorFactory<R, P> bulkResourceDiscriminatorFactory();
+
+}

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

@@ -146,8 +146,7 @@ public void delete(P primary, Context<P> context) {
     resource.ifPresent(r -> client.resource(r).delete());
   }
 
-  @Override
-  protected void deleteBulkResourceWithIndex(P primary, R resource, int i, Context<P> context) {
+  public void deleteBulkResourceWithIndex(P primary, R resource, int i, Context<P> context) {
     client.resource(resource).delete();
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonebulkdependent/ConfigMapBulkDependentResource.java

@@ -10,35 +10,38 @@
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.processing.dependent.BulkDependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.BulkResourceDiscriminatorFactory;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 
 public class ConfigMapBulkDependentResource
-    extends CRUDKubernetesDependentResource<ConfigMap, StandaloneBulkDependentTestCustomResource> {
+    extends CRUDKubernetesDependentResource<ConfigMap, StandaloneBulkDependentTestCustomResource>
+    implements BulkDependentResource<ConfigMap, StandaloneBulkDependentTestCustomResource> {
 
   private final static Logger log = LoggerFactory.getLogger(ConfigMapBulkDependentResource.class);
 
   public static final String LABEL_KEY = "bulk";
   public static final String LABEL_VALUE = "true";
+  private BulkResourceDiscriminatorFactory<ConfigMap, StandaloneBulkDependentTestCustomResource> factory =
+      index -> (resource, primary, context) -> {
+        var resources = context.getSecondaryResources(resource).stream()
+            .filter(r -> r.getMetadata().getName().endsWith("-" + index))
+            .collect(Collectors.toList());
+        if (resources.isEmpty()) {
+          return Optional.empty();
+        } else if (resources.size() > 1) {
+          throw new IllegalStateException("More than one resource found for index:" + index);
+        } else {
+          return Optional.of(resources.get(0));
+        }
+      };
 
   public ConfigMapBulkDependentResource() {
     super(ConfigMap.class);
-    setBulkResourceDiscriminatorFactory(
-        index -> (resource, primary, context) -> {
-          var resources = context.getSecondaryResources(resource).stream()
-              .filter(r -> r.getMetadata().getName().endsWith("-" + index))
-              .collect(Collectors.toList());
-          if (resources.isEmpty()) {
-            return Optional.empty();
-          } else if (resources.size() > 1) {
-            throw new IllegalStateException("More than one resource found for index:" + index);
-          } else {
-            return Optional.of(resources.get(0));
-          }
-        });
   }
 
   @Override
-  protected ConfigMap desired(StandaloneBulkDependentTestCustomResource primary,
+  public ConfigMap desired(StandaloneBulkDependentTestCustomResource primary,
       int index, Context<StandaloneBulkDependentTestCustomResource> context) {
     ConfigMap configMap = new ConfigMap();
     configMap.setMetadata(new ObjectMetaBuilder()
@@ -51,10 +54,13 @@ protected ConfigMap desired(StandaloneBulkDependentTestCustomResource primary,
   }
 
   @Override
-  protected Optional<Integer> count(StandaloneBulkDependentTestCustomResource primary,
+  public int count(StandaloneBulkDependentTestCustomResource primary,
       Context<StandaloneBulkDependentTestCustomResource> context) {
-    return Optional.of(primary.getSpec().getNumberOfResources());
+    return primary.getSpec().getNumberOfResources();
   }
 
-
+  @Override
+  public BulkResourceDiscriminatorFactory<ConfigMap, StandaloneBulkDependentTestCustomResource> bulkResourceDiscriminatorFactory() {
+    return factory;
+  }
 }