wip

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

Author: csviri

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

@@ -3,10 +3,17 @@
 import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import java.util.function.BiPredicate;
 
-public abstract class BaseControl<T extends BaseControl<T>> {
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.reconciler.expectation.Expectation;
+import io.javaoperatorsdk.operator.api.reconciler.expectation.ExpectationAdapter;
+import io.javaoperatorsdk.operator.api.reconciler.expectation.ExpectationContext;
+
+public abstract class BaseControl<T extends BaseControl<T, P>, P extends HasMetadata> {
 
   private Long scheduleDelay = null;
+  private Expectation<P> expectation;
 
   public T rescheduleAfter(long delay) {
     rescheduleAfter(Duration.ofMillis(delay));
@@ -25,4 +32,16 @@ public T rescheduleAfter(long delay, TimeUnit timeUnit) {
   public Optional<Long> getScheduleDelay() {
     return Optional.ofNullable(scheduleDelay);
   }
+
+  public void expect(Expectation<P> expectation) {
+    this.expectation = expectation;
+  }
+
+  public void expect(BiPredicate<P, ExpectationContext<P>> expectation, Duration timeout) {
+    this.expectation = new ExpectationAdapter<>(expectation, timeout);
+  }
+
+  public Expectation<P> getExpectation() {
+    return expectation;
+  }
 }

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

@@ -1,44 +1,44 @@
 package io.javaoperatorsdk.operator.api.reconciler;
 
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 import io.javaoperatorsdk.operator.processing.event.source.IndexerResourceCache;
 
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Stream;
-
 public interface CacheAware<P extends HasMetadata> {
-    default <R> Optional<R> getSecondaryResource(Class<R> expectedType) {
-        return getSecondaryResource(expectedType, null);
-    }
+  default <R> Optional<R> getSecondaryResource(Class<R> expectedType) {
+    return getSecondaryResource(expectedType, null);
+  }
 
-    <R> Set<R> getSecondaryResources(Class<R> expectedType);
+  <R> Set<R> getSecondaryResources(Class<R> expectedType);
 
-    default <R> Stream<R> getSecondaryResourcesAsStream(Class<R> expectedType) {
-        return getSecondaryResources(expectedType).stream();
-    }
+  default <R> Stream<R> getSecondaryResourcesAsStream(Class<R> expectedType) {
+    return getSecondaryResources(expectedType).stream();
+  }
 
-    <R> Optional<R> getSecondaryResource(Class<R> expectedType, String eventSourceName);
+  <R> Optional<R> getSecondaryResource(Class<R> expectedType, String eventSourceName);
 
-    ControllerConfiguration<P> getControllerConfiguration();
+  ControllerConfiguration<P> getControllerConfiguration();
 
-    /**
-     * Retrieves the primary resource.
-     *
-     * @return the primary resource associated with the current reconciliation
-     */
-    P getPrimaryResource();
+  /**
+   * Retrieves the primary resource.
+   *
+   * @return the primary resource associated with the current reconciliation
+   */
+  P getPrimaryResource();
 
-    /**
-     * Retrieves the primary resource cache.
-     *
-     * @return the {@link IndexerResourceCache} associated with the associated {@link Reconciler} for
-     *     this context
-     */
-    @SuppressWarnings("unused")
-    IndexedResourceCache<P> getPrimaryCache();
+  /**
+   * Retrieves the primary resource cache.
+   *
+   * @return the {@link IndexerResourceCache} associated with the associated {@link Reconciler} for
+   *     this context
+   */
+  @SuppressWarnings("unused")
+  IndexedResourceCache<P> getPrimaryCache();
 
-    EventSourceRetriever<P> eventSourceRetriever();
+  EventSourceRetriever<P> eventSourceRetriever();
 }

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

@@ -1,15 +1,11 @@
 package io.javaoperatorsdk.operator.api.reconciler;
 
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.ExecutorService;
-import java.util.stream.Stream;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedWorkflowAndDependentResourceContext;
-import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 import io.javaoperatorsdk.operator.processing.event.source.IndexerResourceCache;
 
 public interface Context<P extends HasMetadata> extends CacheAware<P> {

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

@@ -1,6 +1,8 @@
 package io.javaoperatorsdk.operator.api.reconciler;
 
-public class DeleteControl extends BaseControl<DeleteControl> {
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
+public class DeleteControl<P extends HasMetadata> extends BaseControl<DeleteControl<P>, P> {
 
   private final boolean removeFinalizer;
 
@@ -27,7 +29,7 @@ public static DeleteControl defaultDelete() {
    *
    * @return delete control that will not remove finalizer.
    */
-  public static DeleteControl noFinalizerRemoval() {
+  public static <T extends HasMetadata> DeleteControl<T> noFinalizerRemoval() {
     return new DeleteControl(false);
   }
 
@@ -36,7 +38,7 @@ public boolean isRemoveFinalizer() {
   }
 
   @Override
-  public DeleteControl rescheduleAfter(long delay) {
+  public DeleteControl<P> rescheduleAfter(long delay) {
     if (removeFinalizer) {
       throw new IllegalStateException("Cannot reschedule cleanup if removing finalizer");
     }

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

@@ -6,7 +6,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
 public class ErrorStatusUpdateControl<P extends HasMetadata>
-    extends BaseControl<ErrorStatusUpdateControl<P>> {
+    extends BaseControl<ErrorStatusUpdateControl<P>, P> {
 
   private final P resource;
   private boolean noRetry = false;

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

@@ -5,7 +5,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.CustomResource;
 
-public class UpdateControl<P extends HasMetadata> extends BaseControl<UpdateControl<P>> {
+public class UpdateControl<P extends HasMetadata> extends BaseControl<UpdateControl<P>, P> {
 
   private final P resource;
   private final boolean patchResource;

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

@@ -0,0 +1,22 @@
+package io.javaoperatorsdk.operator.api.reconciler.expectation;
+
+import java.time.Duration;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
+public abstract class AbstractExpectation<P extends HasMetadata> implements Expectation<P> {
+
+  protected final Duration timeout;
+
+  protected AbstractExpectation(Duration timeout) {
+    this.timeout = timeout;
+  }
+
+  @Override
+  public abstract boolean isFulfilled(P primary, ExpectationContext<P> context);
+
+  @Override
+  public Duration timeout() {
+    return timeout;
+  }
+}

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

@@ -1,12 +1,12 @@
 package io.javaoperatorsdk.operator.api.reconciler.expectation;
 
-import io.fabric8.kubernetes.api.model.HasMetadata;
-
 import java.time.Duration;
 
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
 public interface Expectation<P extends HasMetadata> {
 
-  boolean isMet(P primary, ExpectationContext<P> context);
+  boolean isFulfilled(P primary, ExpectationContext<P> context);
 
   Duration timeout();
 }

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

@@ -0,0 +1,21 @@
+package io.javaoperatorsdk.operator.api.reconciler.expectation;
+
+import java.time.Duration;
+import java.util.function.BiPredicate;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+
+public class ExpectationAdapter<P extends HasMetadata> extends AbstractExpectation<P> {
+
+  private final BiPredicate<P, ExpectationContext<P>> expectation;
+
+  public ExpectationAdapter(BiPredicate<P, ExpectationContext<P>> expectation, Duration timeout) {
+    super(timeout);
+    this.expectation = expectation;
+  }
+
+  @Override
+  public boolean isFulfilled(P primary, ExpectationContext<P> context) {
+    return expectation.test(primary, context);
+  }
+}

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

@@ -3,6 +3,4 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.CacheAware;
 
-public interface ExpectationContext<P extends HasMetadata> extends CacheAware<P> {
-
-}
+public interface ExpectationContext<P extends HasMetadata> extends CacheAware<P> {}

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

@@ -0,0 +1,14 @@
+package io.javaoperatorsdk.operator.api.reconciler.expectation;
+
+public class ExpectationResult {
+
+    private ExpectationStatus status;
+
+    public ExpectationResult(ExpectationStatus status) {
+        this.status = status;
+    }
+
+    public ExpectationStatus getStatus() {
+        return status;
+    }
+}

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

@@ -0,0 +1,6 @@
+package io.javaoperatorsdk.operator.api.reconciler.expectation;
+
+public enum ExpectationStatus {
+    TIMEOUT,
+    FULFILLED;
+}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

@@ -250,7 +250,7 @@ private PostExecutionControl<P> createPostExecutionControl(
   }
 
   private void updatePostExecutionControlWithReschedule(
-      PostExecutionControl<P> postExecutionControl, BaseControl<?> baseControl) {
+      PostExecutionControl<P> postExecutionControl, BaseControl<?, ?> baseControl) {
     baseControl.getScheduleDelay().ifPresent(postExecutionControl::withReSchedule);
   }