feat: read-only bulkd dependent

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

Author: csviri

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

@@ -60,7 +60,7 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
   }
 
   protected ReconcileResult<R> reconcile(P primary, R actualResource, Context<P> context) {
-    if (creatable || updatable) {
+    if (creatable() || updatable()) {
       if (actualResource == null) {
         if (creatable) {
           var desired = desired(primary, context);
@@ -70,7 +70,7 @@ protected ReconcileResult<R> reconcile(P primary, R actualResource, Context<P> c
           return ReconcileResult.resourceCreated(createdResource);
         }
       } else {
-        if (updatable) {
+        if (updatable()) {
           final Matcher.Result<R> match = match(actualResource, primary, context);
           if (!match.matched()) {
             final var desired = match.computedDesired().orElseGet(() -> desired(primary, context));
@@ -216,4 +216,12 @@ public String name() {
   public void setName(String name) {
     this.name = name;
   }
+
+  protected boolean creatable() {
+    return creatable;
+  }
+
+  protected boolean updatable() {
+    return updatable;
+  }
 }

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

@@ -13,8 +13,7 @@
  * {@link Creator} and {@link Deleter} interfaces out of the box. A concrete dependent resource can
  * implement additionally also {@link Updater}.
  */
-public interface BulkDependentResource<R, P extends HasMetadata>
-    extends Creator<R, P>, Deleter<P> {
+public interface BulkDependentResource<R, P extends HasMetadata> {
 
   /**
    * Retrieves a map of desired secondary resources associated with the specified primary resource,
@@ -26,7 +25,10 @@ public interface BulkDependentResource<R, P extends HasMetadata>
    * @return a Map associating desired secondary resources with the specified primary via arbitrary
    *         identifiers
    */
-  Map<String, R> desiredResources(P primary, Context<P> context);
+  default Map<String, R> desiredResources(P primary, Context<P> context) {
+    throw new IllegalStateException(
+        "Implement desiredResources in case a non read-only bulk dependent resource");
+  }
 
   /**
    * Retrieves the actual secondary resources currently existing on the server and associated with

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

@@ -33,9 +33,7 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
     final List<ReconcileResult<R>> results = new ArrayList<>(desiredResources.size());
     final var updatable = bulkDependentResource instanceof Updater;
     desiredResources.forEach((key, value) -> {
-      final var instance =
-          updatable ? new UpdatableBulkDependentResourceInstance<>(bulkDependentResource, value)
-              : new BulkDependentResourceInstance<>(bulkDependentResource, value);
+      final var instance = new BulkDependentResourceInstance<>(bulkDependentResource, value);
       results.add(instance.reconcile(primary, actualResources.get(key), context));
     });
 
@@ -67,7 +65,7 @@ private void deleteExtraResources(Set<String> expectedKeys,
   @Ignore
   private static class BulkDependentResourceInstance<R, P extends HasMetadata>
       extends AbstractDependentResource<R, P>
-      implements Creator<R, P>, Deleter<P> {
+      implements Creator<R, P>, Deleter<P>, Updater<R, P> {
     private final BulkDependentResource<R, P> bulkDependentResource;
     private final R desired;
 
@@ -112,26 +110,24 @@ public Class<R> resourceType() {
       return asAbstractDependentResource().resourceType();
     }
 
-    @Override
+    @SuppressWarnings("unchecked")
     public R create(R desired, P primary, Context<P> context) {
-      return bulkDependentResource.create(desired, primary, context);
+      return ((Creator<R, P>) bulkDependentResource).create(desired, primary, context);
     }
-  }
 
-  /**
-   * Makes sure that the instance implements Updater if its precursor does as well.
-   *
-   * @param <R>
-   * @param <P>
-   */
-  @Ignore
-  private static class UpdatableBulkDependentResourceInstance<R, P extends HasMetadata>
-      extends BulkDependentResourceInstance<R, P> implements Updater<R, P> {
+    @Override
+    protected boolean isCreatable() {
+      return bulkDependentResource instanceof Creator<?, ?>;
+    }
 
-    private UpdatableBulkDependentResourceInstance(
-        BulkDependentResource<R, P> bulkDependentResource,
-        R desired) {
-      super(bulkDependentResource, desired);
+    @Override
+    protected boolean isUpdatable() {
+      return bulkDependentResource instanceof Updater<?, ?>;
+    }
+
+    @Override
+    public boolean isDeletable() {
+      return bulkDependentResource instanceof Deleter<?>;
     }
   }
 }

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

@@ -0,0 +1,11 @@
+package io.javaoperatorsdk.operator.processing.dependent;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
+
+public interface CRUDBulkDependentResource<R, P extends HasMetadata>
+    extends BulkDependentResource<R, P>,
+    Creator<R, P>,
+    BulkUpdater<R, P>,
+    Deleter<P> {
+}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalBulkDependentResource.java

@@ -7,15 +7,19 @@
 import java.util.stream.Collectors;
 
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.processing.dependent.BulkDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.BulkUpdater;
+import io.javaoperatorsdk.operator.processing.dependent.Creator;
 import io.javaoperatorsdk.operator.processing.dependent.external.PollingDependentResource;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.sample.bulkdependent.BulkDependentTestCustomResource;
 
 public class ExternalBulkDependentResource
     extends PollingDependentResource<ExternalResource, BulkDependentTestCustomResource>
     implements BulkDependentResource<ExternalResource, BulkDependentTestCustomResource>,
+    Creator<ExternalResource, BulkDependentTestCustomResource>,
+    Deleter<BulkDependentTestCustomResource>,
     BulkUpdater<ExternalResource, BulkDependentTestCustomResource> {
 
   public static final String EXTERNAL_RESOURCE_NAME_DELIMITER = "#";

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/externalstatebulkdependent/BulkDependentResourceExternalWithState.java

@@ -11,10 +11,8 @@
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 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.BulkUpdater;
-import io.javaoperatorsdk.operator.processing.dependent.DependentResourceWithExplicitState;
-import io.javaoperatorsdk.operator.processing.dependent.Matcher;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
+import io.javaoperatorsdk.operator.processing.dependent.*;
 import io.javaoperatorsdk.operator.processing.dependent.external.PerResourcePollingDependentResource;
 import io.javaoperatorsdk.operator.support.ExternalIDGenServiceMock;
 import io.javaoperatorsdk.operator.support.ExternalResource;
@@ -25,8 +23,10 @@ public class BulkDependentResourceExternalWithState extends
     PerResourcePollingDependentResource<ExternalResource, ExternalStateBulkDependentCustomResource>
     implements
     BulkDependentResource<ExternalResource, ExternalStateBulkDependentCustomResource>,
-    DependentResourceWithExplicitState<ExternalResource, ExternalStateBulkDependentCustomResource, ConfigMap>,
-    BulkUpdater<ExternalResource, ExternalStateBulkDependentCustomResource> {
+    Creator<ExternalResource, ExternalStateBulkDependentCustomResource>,
+    Deleter<ExternalStateBulkDependentCustomResource>,
+    BulkUpdater<ExternalResource, ExternalStateBulkDependentCustomResource>,
+    DependentResourceWithExplicitState<ExternalResource, ExternalStateBulkDependentCustomResource, ConfigMap> {
 
   public static final String DELIMITER = "-";
   ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance();