fix: use context provided by Expectation lamba to prevent hogging on a specific context/primary instance

Signed-off-by: David Sondermann <david.sondermann@hivemq.com>

Author: Donnerbart

docs/content/en/blog/releases/v5-2-release.md

@@ -99,7 +99,6 @@ public class MyReconciler implements Reconciler<MyResource> {
 
     @Override
     public UpdateControl<MyResource> reconcile(MyResource primary, Context<MyResource> context) {
-
         // Exit early if expectation is not yet fulfilled or timed out
         if (expectationManager.ongoingExpectationPresent(primary, context)) {
             return UpdateControl.noUpdate();
@@ -109,7 +108,7 @@ public class MyReconciler implements Reconciler<MyResource> {
         if (deployment.isEmpty()) {
             createDeployment(primary, context);
             expectationManager.setExpectation(
-                primary, Duration.ofSeconds(30), deploymentReadyExpectation(context));
+                primary, Duration.ofSeconds(30), deploymentReadyExpectation());
             return UpdateControl.noUpdate();
         }
 

docs/content/en/docs/documentation/reconciler.md

@@ -286,7 +286,6 @@ public class ExpectationReconciler implements Reconciler<ExpectationCustomResour
     @Override
     public UpdateControl<ExpectationCustomResource> reconcile(
             ExpectationCustomResource primary, Context<ExpectationCustomResource> context) {
-
         // exiting asap if there is an expectation that is not timed out neither fulfilled yet
         if (expectationManager.ongoingExpectationPresent(primary, context)) {
             return UpdateControl.noUpdate();
@@ -296,7 +295,7 @@ public class ExpectationReconciler implements Reconciler<ExpectationCustomResour
         if (deployment.isEmpty()) {
             createDeployment(primary, context);
             expectationManager.setExpectation(
-                    primary, Duration.ofSeconds(timeout), deploymentReadyExpectation(context));
+                    primary, Duration.ofSeconds(timeout), deploymentReadyExpectation());
             return UpdateControl.noUpdate();
         } else {
             // checks if the expectation if it is fulfilled, and also removes it.
@@ -311,10 +310,6 @@ public class ExpectationReconciler implements Reconciler<ExpectationCustomResour
             }
         }
         return UpdateControl.noUpdate();
-        
     }
 }
 ```
-
-
-

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

@@ -74,7 +74,7 @@ public UpdateControl<ExpectationCustomResource> reconcile(
       createDeployment(primary, context);
       var set =
           expectationManager.checkAndSetExpectation(
-              primary, context, Duration.ofSeconds(timeout), deploymentReadyExpectation(context));
+              primary, context, Duration.ofSeconds(timeout), deploymentReadyExpectation());
       if (set) {
         return UpdateControl.noUpdate();
       }
@@ -143,11 +143,10 @@ private static void createDeployment(
     context.getClient().resource(deployment).serverSideApply();
   }
 
-  private static Expectation<ExpectationCustomResource> deploymentReadyExpectation(
-      Context<ExpectationCustomResource> context) {
+  private static Expectation<ExpectationCustomResource> deploymentReadyExpectation() {
     return Expectation.createExpectation(
         DEPLOYMENT_READY_EXPECTATION_NAME,
-        (p, c) ->
+        (primary, context) ->
             context
                 .getSecondaryResource(Deployment.class)
                 .map(