delete, other improvements

Author: csviri

docs/assets/js/uikit.js

@@ -8214,7 +8214,7 @@
 
             updateAria: function(toggled) {
                 attr(this.$el, 'aria-expanded', isBoolean(toggled)
-                    ? toggled
+                    ? toggled// todo delete bulk support
                     : isToggled(this.target, this.cls)
                 );
             }

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

@@ -34,15 +34,15 @@ public abstract class AbstractDependentResource<R, P extends HasMetadata>
   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 = bulk ? bulkDependentResource.count(primary, context) : 1;
     if (bulk) {
-      // todo do this just if it is deleter?
-      cleanupBulkResourcesIfRequired(count, resourceDiscriminator.size(), primary, context);
+      deleteBulkResourcesIfRequired(count, resourceDiscriminator.size(), primary, context);
       adjustDiscriminators(count);
     }
     ReconcileResult<R> result = new ReconcileResult<>();
@@ -53,7 +53,7 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
     return result;
   }
 
-  private void cleanupBulkResourcesIfRequired(int targetCount, int actualCount, P primary,
+  protected void deleteBulkResourcesIfRequired(int targetCount, int actualCount, P primary,
       Context<P> context) {
     if (targetCount >= actualCount) {
       return;

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

@@ -2,17 +2,37 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 
-public interface BulkDependentResource<R, P extends HasMetadata> {
+/**
+ * Manages dynamic number of resources created for a primary resource. Since the point of a bulk
+ * dependent resource is to manage the number of secondary resources dynamically it implement
+ * {@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> {
 
+  /**
+   * @return number of resources to create
+   */
   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");
-  }
+  R desired(P primary, int index, Context<P> context);
 
+  /**
+   * Used to delete resource if the desired count is lower than the actual count of a resource.
+   *
+   * @param primary resource
+   * @param resource actual resource from the cache for the index
+   * @param i index of the resource
+   * @param context actual context
+   */
   void deleteBulkResourceWithIndex(P primary, R resource, int i, Context<P> context);
 
+  /**
+   * @return a discriminator factor that helps to create a discriminator for a certain resource with
+   *         an index
+   */
   BulkResourceDiscriminatorFactory<R, P> bulkResourceDiscriminatorFactory();
 
 }

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

@@ -138,9 +138,13 @@ public Result<R> match(R actualResource, P primary, int index, Context<P> contex
     return matcher.match(actualResource, primary, index, context);
   }
 
-  // todo delete bulk support
   public void delete(P primary, Context<P> context) {
-    getSecondaryResource(primary, context).ifPresent(r -> client.resource(r).delete());
+    if (bulk) {
+      deleteBulkResourcesIfRequired(0, resourceDiscriminator.size(), primary, context);
+    } else {
+      var resource = getSecondaryResource(primary, context);
+      resource.ifPresent(r -> client.resource(r).delete());
+    }
   }
 
   public void deleteBulkResourceWithIndex(P primary, R resource, int i, Context<P> context) {
@@ -158,8 +162,7 @@ protected Resource<R> prepare(R desired, P primary, String actionName) {
     } else if (useDefaultAnnotationsToIdentifyPrimary()) {
       addDefaultSecondaryToPrimaryMapperAnnotations(desired, primary);
     }
-    Class<R> targetClass = (Class<R>) desired.getClass();
-    return client.resources(targetClass).inNamespace(desired.getMetadata().getNamespace())
+    return client.resource(desired).inNamespace(desired.getMetadata().getNamespace())
         .resource(desired);
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/StandaloneBulkDependentIT.java

@@ -26,6 +26,7 @@ class StandaloneBulkDependentIT {
       LocallyRunOperatorExtension.builder().withReconciler(new StandaloneBulkDependentReconciler())
           .build();
 
+  // TODO update, deleter - no GC test, external bulk resource
   @Test
   void managesBulkConfigMaps() {
     operator.create(testResource());

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

@@ -6,8 +6,9 @@
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
 
-@ControllerConfiguration
+@ControllerConfiguration(dependents = @Dependent(type = ConfigMapBulkDependentResource.class))
 public class ManagedBulkDependentReconciler
     implements Reconciler<StandaloneBulkDependentTestCustomResource> {