wip

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/expectation/ExpectationManager.java

@@ -33,6 +33,31 @@ public class ExpectationManager<P extends HasMetadata> {
   protected final ConcurrentHashMap<ResourceID, RegisteredExpectation<P>> registeredExpectations =
       new ConcurrentHashMap<>();
 
+  /**
+   * Checks if the expectation holds, if not sets the expectation with the given timeout.
+   *
+   * @return false, if the expectation is already fulfilled, therefore, not registered. Returns true
+   *     if expectation is not met and set with a timeout.
+   */
+  public boolean checkAndSetExpectation(
+      P primary, Context<P> context, Duration timeout, Expectation<P> expectation) {
+    var fulfilled = expectation.isFulfilled(primary, context);
+    if (fulfilled) {
+      return false;
+    } else {
+      setExpectation(primary, timeout, expectation);
+      return true;
+    }
+  }
+
+  /**
+   * Sets a target expectation with given timeout.
+   *
+   * @param primary resource
+   * @param timeout of expectation
+   * @param expectation to check
+   */
+  // we might consider in the future to throw an exception if an expectation is already set
   public void setExpectation(P primary, Duration timeout, Expectation<P> expectation) {
     registeredExpectations.put(
         ResourceID.fromResource(primary),

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/expectation/ExpectationManagerTest.java

@@ -181,4 +181,28 @@ void setExpectationShouldReplaceExistingExpectation() {
 
     assertThat(expectationManager.getExpectation(configMap)).contains(expectation2);
   }
+
+  @Test
+  void checkAndSetExpectationAlreadyMet() {
+    Expectation<ConfigMap> expectation = mock(Expectation.class);
+    when(expectation.isFulfilled(any(), any())).thenReturn(true);
+
+    var res =
+        expectationManager.checkAndSetExpectation(
+            configMap, mock(Context.class), Duration.ofMinutes(5), expectation);
+    assertThat(res).isFalse();
+    assertThat(expectationManager.getExpectation(configMap)).isEmpty();
+  }
+
+  @Test
+  void checkAndSetExpectationNotMet() {
+    Expectation<ConfigMap> expectation = mock(Expectation.class);
+    when(expectation.isFulfilled(any(), any())).thenReturn(false);
+
+    var res =
+        expectationManager.checkAndSetExpectation(
+            configMap, mock(Context.class), Duration.ofMinutes(5), expectation);
+    assertThat(res).isTrue();
+    assertThat(expectationManager.getExpectation(configMap)).isPresent();
+  }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/ExpectationReconciler.java

@@ -68,9 +68,12 @@ public UpdateControl<ExpectationCustomResource> reconcile(
     var deployment = context.getSecondaryResource(Deployment.class);
     if (deployment.isEmpty()) {
       createDeployment(primary, context);
-      expectationManager.setExpectation(
-          primary, Duration.ofSeconds(timeout), deploymentReadyExpectation(context));
-      return UpdateControl.noUpdate();
+      var set =
+          expectationManager.checkAndSetExpectation(
+              primary, context, Duration.ofSeconds(timeout), deploymentReadyExpectation(context));
+      if (set) {
+        return UpdateControl.noUpdate();
+      }
     } else {
       // checks the expectation if it is fulfilled also removes it,
       // in your logic you might add a next expectation based on your workflow