From 89a5cf036304b27b8254c45de34fddfdb23de77b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Jan 2023 09:02:43 +0100
Subject: [PATCH 1/5] chore(deps-dev): bump mockito-core from 5.1.0 to 5.1.1
 (#1745)

Bumps [mockito-core](https://github.com/mockito/mockito) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.1.0...v5.1.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4c088ed87d..df93fce659 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <fabric8-client.version>6.3.1</fabric8-client.version>
         <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.19.0</log4j.version>
-        <mokito.version>5.1.0</mokito.version>
+        <mokito.version>5.1.1</mokito.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <compile-testing.version>0.19</compile-testing.version>
         <javapoet.version>1.13.0</javapoet.version>

From 0b7e374343a4d67d4cd3a0a853c084f461aea22e Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Mon, 19 Sep 2022 10:41:37 +0200
Subject: [PATCH 2/5] feat: desired method aware of actual resource

---
 .../processing/dependent/AbstractDependentResource.java     | 6 +++---
 .../operator/processing/dependent/DesiredEqualsMatcher.java | 2 +-
 .../dependent/kubernetes/KubernetesDependentResource.java   | 4 ++--
 .../processing/dependent/AbstractDependentResourceTest.java | 3 ++-
 .../kubernetes/GenericKubernetesResourceMatcherTest.java    | 2 +-
 .../cleanermanageddependent/ConfigMapDependentResource.java | 2 +-
 .../DependentAnnotationSecondaryMapperReconciler.java       | 2 +-
 .../sample/dependentfilter/FilteredDependentConfigMap.java  | 2 +-
 .../ConfigMapDependentResource.java                         | 2 +-
 .../DependentResourceCrossRefReconciler.java                | 4 ++--
 .../DependentGarbageCollectionTestReconciler.java           | 2 +-
 .../MultipleDependentResourceConfigMap.java                 | 2 +-
 .../ConfigMapDependentResource1.java                        | 2 +-
 .../ConfigMapDependentResource2.java                        | 2 +-
 .../StandaloneDependentTestReconciler.java                  | 2 +-
 .../workflowallfeature/ConfigMapDependentResource.java      | 2 +-
 .../workflowallfeature/DeploymentDependentResource.java     | 2 +-
 .../operator/sample/dependent/SchemaDependentResource.java  | 2 +-
 .../operator/sample/dependent/SecretDependentResource.java  | 2 +-
 .../operator/sample/DeploymentDependentResource.java        | 2 +-
 .../operator/sample/ServiceDependentResource.java           | 2 +-
 .../operator/sample/ConfigMapDependentResource.java         | 2 +-
 .../operator/sample/DeploymentDependentResource.java        | 2 +-
 .../operator/sample/IngressDependentResource.java           | 2 +-
 .../operator/sample/ServiceDependentResource.java           | 2 +-
 25 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java
index 7a32938403..542e455796 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java
@@ -56,7 +56,7 @@ protected ReconcileResult<R> reconcile(P primary, R actualResource, Context<P> c
     if (creatable || updatable) {
       if (actualResource == null) {
         if (creatable) {
-          var desired = desired(primary, context);
+          var desired = desired(primary, null, context);
           throwIfNull(desired, primary, "Desired");
           logForOperation("Creating", primary, desired);
           var createdResource = handleCreate(desired, primary, context);
@@ -66,7 +66,7 @@ protected ReconcileResult<R> reconcile(P primary, R actualResource, Context<P> c
         if (updatable) {
           final Matcher.Result<R> match = match(actualResource, primary, context);
           if (!match.matched()) {
-            final var desired = match.computedDesired().orElse(desired(primary, context));
+            final var desired = match.computedDesired().orElse(desired(primary, actual, context));
             throwIfNull(desired, primary, "Desired");
             logForOperation("Updating", primary, desired);
             var updatedResource = handleUpdate(actualResource, desired, primary, context);
@@ -147,7 +147,7 @@ protected R handleUpdate(R actual, R desired, P primary, Context<P> context) {
     return updated;
   }
 
-  protected R desired(P primary, Context<P> context) {
+  protected R desired(P primary, R actual, Context<P> context) {
     throw new IllegalStateException(
         "desired method must be implemented if this DependentResource can be created and/or updated");
   }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/DesiredEqualsMatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/DesiredEqualsMatcher.java
index 459d7951d6..58a9d18d4f 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/DesiredEqualsMatcher.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/DesiredEqualsMatcher.java
@@ -13,7 +13,7 @@ public DesiredEqualsMatcher(AbstractDependentResource<R, P> abstractDependentRes
 
   @Override
   public Result<R> match(R actualResource, P primary, Context<P> context) {
-    var desired = abstractDependentResource.desired(primary, context);
+    var desired = abstractDependentResource.desired(primary, actualResource, context);
     return Result.computed(actualResource.equals(desired), desired);
   }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
index 5e2b209a71..dc3f4e0c40 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
@@ -237,8 +237,8 @@ public KubernetesClient getKubernetesClient() {
   }
 
   @Override
-  protected R desired(P primary, Context<P> context) {
-    return super.desired(primary, context);
+  protected R desired(P primary, R actual, Context<P> context) {
+    return super.desired(primary, actual, context);
   }
 
   private void prepareEventFiltering(R desired, ResourceID resourceID) {
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResourceTest.java
index 330f5b85b7..4e37e15b61 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResourceTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResourceTest.java
@@ -92,7 +92,8 @@ protected void onUpdated(TestCustomResource primary, ConfigMap updated, ConfigMa
         Context<TestCustomResource> context) {}
 
     @Override
-    protected ConfigMap desired(TestCustomResource primary, Context<TestCustomResource> context) {
+    protected ConfigMap desired(TestCustomResource primary, ConfigMap actual,
+        Context<TestCustomResource> context) {
       return desired;
     }
 
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java
index d39db6ced6..38a4569511 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java
@@ -93,7 +93,7 @@ public TestDependentResource(Deployment desired) {
     }
 
     @Override
-    protected Deployment desired(HasMetadata primary, Context context) {
+    protected Deployment desired(HasMetadata primary, Deployment actual, Context context) {
       final var currentCase = Optional.ofNullable(primary)
           .map(p -> p.getMetadata().getLabels().get("case"))
           .orElse(null);
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/cleanermanageddependent/ConfigMapDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/cleanermanageddependent/ConfigMapDependentResource.java
index 9941779784..90ae3776d8 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/cleanermanageddependent/ConfigMapDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/cleanermanageddependent/ConfigMapDependentResource.java
@@ -25,7 +25,7 @@ public ConfigMapDependentResource() {
 
   @Override
   protected ConfigMap desired(CleanerForManagedDependentCustomResource primary,
-      Context<CleanerForManagedDependentCustomResource> context) {
+      ConfigMap actual, Context<CleanerForManagedDependentCustomResource> context) {
 
     ConfigMap configMap = new ConfigMap();
     configMap.setMetadata(new ObjectMeta());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentannotationsecondarymapper/DependentAnnotationSecondaryMapperReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentannotationsecondarymapper/DependentAnnotationSecondaryMapperReconciler.java
index ec4a2c86b9..8dd6de7ef7 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentannotationsecondarymapper/DependentAnnotationSecondaryMapperReconciler.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentannotationsecondarymapper/DependentAnnotationSecondaryMapperReconciler.java
@@ -44,7 +44,7 @@ public ConfigMapDependentResource() {
 
     @Override
     protected ConfigMap desired(DependentAnnotationSecondaryMapperResource primary,
-        Context<DependentAnnotationSecondaryMapperResource> context) {
+        ConfigMap actual, Context<DependentAnnotationSecondaryMapperResource> context) {
       ConfigMap configMap = new ConfigMap();
       configMap.setMetadata(new ObjectMetaBuilder()
           .withName(primary.getMetadata().getName())
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentfilter/FilteredDependentConfigMap.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentfilter/FilteredDependentConfigMap.java
index ee4bd4cde7..5f16af2dc1 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentfilter/FilteredDependentConfigMap.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentfilter/FilteredDependentConfigMap.java
@@ -20,7 +20,7 @@ public FilteredDependentConfigMap() {
 
   @Override
   protected ConfigMap desired(DependentFilterTestCustomResource primary,
-      Context<DependentFilterTestCustomResource> context) {
+      ConfigMap actual, Context<DependentFilterTestCustomResource> context) {
     ConfigMap configMap = new ConfigMap();
     configMap.setMetadata(new ObjectMetaBuilder()
         .withName(primary.getMetadata().getName())
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentoperationeventfiltering/ConfigMapDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentoperationeventfiltering/ConfigMapDependentResource.java
index 34fbd21c50..fe3b56e234 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentoperationeventfiltering/ConfigMapDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentoperationeventfiltering/ConfigMapDependentResource.java
@@ -18,7 +18,7 @@ public ConfigMapDependentResource() {
 
   @Override
   protected ConfigMap desired(DependentOperationEventFilterCustomResource primary,
-      Context<DependentOperationEventFilterCustomResource> context) {
+      ConfigMap actual, Context<DependentOperationEventFilterCustomResource> context) {
 
     ConfigMap configMap = new ConfigMap();
     configMap.setMetadata(new ObjectMeta());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentresourcecrossref/DependentResourceCrossRefReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentresourcecrossref/DependentResourceCrossRefReconciler.java
index bb319741b3..086d23c306 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentresourcecrossref/DependentResourceCrossRefReconciler.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentresourcecrossref/DependentResourceCrossRefReconciler.java
@@ -60,7 +60,7 @@ public SecretDependentResource() {
 
     @Override
     protected Secret desired(DependentResourceCrossRefResource primary,
-        Context<DependentResourceCrossRefResource> context) {
+        Secret actual, Context<DependentResourceCrossRefResource> context) {
       Secret secret = new Secret();
       secret.setMetadata(new ObjectMetaBuilder()
           .withName(primary.getMetadata().getName())
@@ -80,7 +80,7 @@ public ConfigMapDependentResource() {
 
     @Override
     protected ConfigMap desired(DependentResourceCrossRefResource primary,
-        Context<DependentResourceCrossRefResource> context) {
+        ConfigMap actual, Context<DependentResourceCrossRefResource> context) {
       var secret = context.getSecondaryResource(Secret.class);
       if (secret.isEmpty()) {
         throw new IllegalStateException("Secret is empty");
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java
index c20d573a03..911051f959 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/kubernetesdependentgarbagecollection/DependentGarbageCollectionTestReconciler.java
@@ -89,7 +89,7 @@ public ConfigMapDependentResource() {
 
     @Override
     protected ConfigMap desired(DependentGarbageCollectionTestCustomResource primary,
-        Context<DependentGarbageCollectionTestCustomResource> context) {
+        ConfigMap actual, Context<DependentGarbageCollectionTestCustomResource> context) {
       ConfigMap configMap = new ConfigMap();
       configMap.setMetadata(new ObjectMetaBuilder()
           .withName(primary.getMetadata().getName())
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceConfigMap.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceConfigMap.java
index 5c2e9974b5..1bdea73737 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceConfigMap.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentresource/MultipleDependentResourceConfigMap.java
@@ -21,7 +21,7 @@ public MultipleDependentResourceConfigMap(int value) {
 
   @Override
   protected ConfigMap desired(MultipleDependentResourceCustomResource primary,
-      Context<MultipleDependentResourceCustomResource> context) {
+      ConfigMap actual, Context<MultipleDependentResourceCustomResource> context) {
     Map<String, String> data = new HashMap<>();
     data.put(DATA_KEY, String.valueOf(value));
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource1.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource1.java
index bf8d60d9c4..8c9475c8c4 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource1.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource1.java
@@ -30,7 +30,7 @@ public ReconcileResult<ConfigMap> reconcile(OrderedManagedDependentCustomResourc
 
   @Override
   protected ConfigMap desired(OrderedManagedDependentCustomResource primary,
-      Context<OrderedManagedDependentCustomResource> context) {
+      ConfigMap actual, Context<OrderedManagedDependentCustomResource> context) {
 
     ConfigMap configMap = new ConfigMap();
     configMap.setMetadata(new ObjectMeta());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource2.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource2.java
index 2b17d615b9..39acb496a2 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource2.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/orderedmanageddependent/ConfigMapDependentResource2.java
@@ -30,7 +30,7 @@ public ReconcileResult<ConfigMap> reconcile(OrderedManagedDependentCustomResourc
 
   @Override
   protected ConfigMap desired(OrderedManagedDependentCustomResource primary,
-      Context<OrderedManagedDependentCustomResource> context) {
+      ConfigMap actual, Context<OrderedManagedDependentCustomResource> context) {
 
     ConfigMap configMap = new ConfigMap();
     configMap.setMetadata(new ObjectMeta());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java
index 70b119c2ab..211f83e139 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java
@@ -95,7 +95,7 @@ public DeploymentDependentResource() {
 
     @Override
     protected Deployment desired(StandaloneDependentTestCustomResource primary,
-        Context<StandaloneDependentTestCustomResource> context) {
+        Deployment actual, Context<StandaloneDependentTestCustomResource> context) {
       Deployment deployment =
           ReconcilerUtils.loadYaml(Deployment.class, StandaloneDependentResourceIT.class,
               "nginx-deployment.yaml");
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/ConfigMapDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/ConfigMapDependentResource.java
index 0620d6a753..21ffb905b6 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/ConfigMapDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/ConfigMapDependentResource.java
@@ -31,7 +31,7 @@ public ConfigMapDependentResource() {
 
   @Override
   protected ConfigMap desired(WorkflowAllFeatureCustomResource primary,
-      Context<WorkflowAllFeatureCustomResource> context) {
+      ConfigMap actual, Context<WorkflowAllFeatureCustomResource> context) {
     ConfigMap configMap = new ConfigMap();
     configMap.setMetadata(new ObjectMetaBuilder()
         .withName(primary.getMetadata().getName())
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/DeploymentDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/DeploymentDependentResource.java
index 61cf18f57b..15be6a1383 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/DeploymentDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/DeploymentDependentResource.java
@@ -15,7 +15,7 @@ public DeploymentDependentResource() {
 
   @Override
   protected Deployment desired(WorkflowAllFeatureCustomResource primary,
-      Context<WorkflowAllFeatureCustomResource> context) {
+      Deployment actual, Context<WorkflowAllFeatureCustomResource> context) {
     Deployment deployment =
         ReconcilerUtils.loadYaml(Deployment.class, WorkflowAllFeatureIT.class,
             "nginx-deployment.yaml");
diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java
index d7ee5d368f..3c6d8754eb 100644
--- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java
+++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java
@@ -62,7 +62,7 @@ public void configureWith(ResourcePollerConfig config) {
   }
 
   @Override
-  public Schema desired(MySQLSchema primary, Context<MySQLSchema> context) {
+  public Schema desired(MySQLSchema primary, Schema actual, Context<MySQLSchema> context) {
     return new Schema(primary.getMetadata().getName(), primary.getSpec().getEncoding());
   }
 
diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SecretDependentResource.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SecretDependentResource.java
index 1aa2ad62e5..019adb5386 100644
--- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SecretDependentResource.java
+++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SecretDependentResource.java
@@ -33,7 +33,7 @@ private static String encode(String value) {
   }
 
   @Override
-  protected Secret desired(MySQLSchema schema, Context<MySQLSchema> context) {
+  protected Secret desired(MySQLSchema schema, Secret actual, Context<MySQLSchema> context) {
     final var password = RandomStringUtils
         .randomAlphanumeric(16); // NOSONAR: we don't need cryptographically-strong randomness here
     final var name = schema.getMetadata().getName();
diff --git a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java
index 25e46fad16..6e19496941 100644
--- a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java
+++ b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java
@@ -21,7 +21,7 @@ private static String tomcatImage(Tomcat tomcat) {
   }
 
   @Override
-  protected Deployment desired(Tomcat tomcat, Context<Tomcat> context) {
+  protected Deployment desired(Tomcat tomcat, Deployment actual, Context<Tomcat> context) {
     Deployment deployment =
         ReconcilerUtils.loadYaml(Deployment.class, getClass(), "deployment.yaml");
     final ObjectMeta tomcatMetadata = tomcat.getMetadata();
diff --git a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java
index 3b526d02bc..bf5bb95850 100644
--- a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java
+++ b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java
@@ -16,7 +16,7 @@ public ServiceDependentResource() {
   }
 
   @Override
-  protected Service desired(Tomcat tomcat, Context<Tomcat> context) {
+  protected Service desired(Tomcat tomcat, Service actual, Context<Tomcat> context) {
     final ObjectMeta tomcatMetadata = tomcat.getMetadata();
     return new ServiceBuilder(ReconcilerUtils.loadYaml(Service.class, getClass(), "service.yaml"))
         .editMetadata()
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java
index 4eddc97be3..8b0e348192 100644
--- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java
+++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java
@@ -29,7 +29,7 @@ public ConfigMapDependentResource() {
   }
 
   @Override
-  protected ConfigMap desired(WebPage webPage, Context<WebPage> context) {
+  protected ConfigMap desired(WebPage webPage, ConfigMap actual, Context<WebPage> context) {
     Map<String, String> data = new HashMap<>();
     data.put("index.html", webPage.getSpec().getHtml());
     Map<String, String> labels = new HashMap<>();
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java
index 8986660bdf..42a188a5c2 100644
--- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java
+++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java
@@ -24,7 +24,7 @@ public DeploymentDependentResource() {
   }
 
   @Override
-  protected Deployment desired(WebPage webPage, Context<WebPage> context) {
+  protected Deployment desired(WebPage webPage, Deployment actual, Context<WebPage> context) {
     Map<String, String> labels = new HashMap<>();
     labels.put(SELECTOR, "true");
     var deploymentName = deploymentName(webPage);
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/IngressDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/IngressDependentResource.java
index 703d3aceb1..6312555abb 100644
--- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/IngressDependentResource.java
+++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/IngressDependentResource.java
@@ -16,7 +16,7 @@ public IngressDependentResource() {
   }
 
   @Override
-  protected Ingress desired(WebPage webPage, Context<WebPage> context) {
+  protected Ingress desired(WebPage webPage, Ingress actual, Context<WebPage> context) {
     return makeDesiredIngress(webPage);
   }
 
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java
index 1080b1b461..efde4a05ec 100644
--- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java
+++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java
@@ -22,7 +22,7 @@ public ServiceDependentResource() {
   }
 
   @Override
-  protected Service desired(WebPage webPage, Context<WebPage> context) {
+  protected Service desired(WebPage webPage, Service actual, Context<WebPage> context) {
     Map<String, String> serviceLabels = new HashMap<>();
     serviceLabels.put(SELECTOR, "true");
     Service service = loadYaml(Service.class, getClass(), "service.yaml");

From d9709f9cf57e6280768964793d9c0cd10bf7bf5d Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Tue, 31 Jan 2023 10:30:14 +0100
Subject: [PATCH 3/5] update

---
 .../processing/dependent/AbstractDependentResource.java       | 3 ++-
 .../processing/dependent/BulkDependentResourceReconciler.java | 2 +-
 .../kubernetes/GenericKubernetesResourceMatcher.java          | 4 ++--
 .../sample/complexdependent/dependent/BaseService.java        | 2 +-
 .../sample/complexdependent/dependent/BaseStatefulSet.java    | 2 +-
 .../externalstate/ExternalWithStateDependentResource.java     | 2 +-
 .../indexdiscriminator/IndexDiscriminatorTestDRConfigMap.java | 2 +-
 .../informerrelatedbehavior/ConfigMapDependentResource.java   | 2 +-
 ...ltipleManagedDependentResourceMultiInformerConfigMap1.java | 1 +
 ...ltipleManagedDependentResourceMultiInformerConfigMap2.java | 1 +
 .../MultipleManagedDependentResourceConfigMap1.java           | 1 +
 .../MultipleManagedDependentResourceConfigMap2.java           | 1 +
 .../operator/sample/restart/ConfigMapDependentResource.java   | 2 +-
 13 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java
index 542e455796..693326f2fa 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java
@@ -66,7 +66,8 @@ protected ReconcileResult<R> reconcile(P primary, R actualResource, Context<P> c
         if (updatable) {
           final Matcher.Result<R> match = match(actualResource, primary, context);
           if (!match.matched()) {
-            final var desired = match.computedDesired().orElse(desired(primary, actual, context));
+            final var desired =
+                match.computedDesired().orElse(desired(primary, actualResource, context));
             throwIfNull(desired, primary, "Desired");
             logForOperation("Updating", primary, desired);
             var updatedResource = handleUpdate(actualResource, desired, primary, context);
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/BulkDependentResourceReconciler.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/BulkDependentResourceReconciler.java
index e740ef3773..726bf93a7a 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/BulkDependentResourceReconciler.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/BulkDependentResourceReconciler.java
@@ -83,7 +83,7 @@ private AbstractDependentResource<R, P> asAbstractDependentResource() {
     }
 
     @Override
-    protected R desired(P primary, Context<P> context) {
+    protected R desired(P primary, R actual, Context<P> context) {
       return desired;
     }
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
index 9952763e6a..99c84087b4 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
@@ -28,7 +28,7 @@ static <R extends HasMetadata, P extends HasMetadata> Matcher<R, P> matcherFor(
 
   @Override
   public Result<R> match(R actualResource, P primary, Context<P> context) {
-    var desired = dependentResource.desired(primary, context);
+    var desired = dependentResource.desired(primary, actualResource, context);
     return match(desired, actualResource, false);
   }
 
@@ -93,7 +93,7 @@ public static <R extends HasMetadata> Result<R> match(R desired, R actualResourc
   public static <R extends HasMetadata, P extends HasMetadata> Result<R> match(
       KubernetesDependentResource<R, P> dependentResource, R actualResource, P primary,
       Context<P> context, boolean considerMetadata) {
-    final var desired = dependentResource.desired(primary, context);
+    final var desired = dependentResource.desired(primary, actualResource, context);
     return match(desired, actualResource, considerMetadata);
   }
 }
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/dependent/BaseService.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/dependent/BaseService.java
index 192bc97de9..4b04588662 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/dependent/BaseService.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/dependent/BaseService.java
@@ -15,7 +15,7 @@ public BaseService(String component) {
   }
 
   @Override
-  protected Service desired(ComplexDependentCustomResource primary,
+  protected Service desired(ComplexDependentCustomResource primary, Service actual,
       Context<ComplexDependentCustomResource> context) {
     var template = ReconcilerUtils.loadYaml(Service.class, getClass(), "service.yaml");
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/dependent/BaseStatefulSet.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/dependent/BaseStatefulSet.java
index 0609e8dab7..e0ac677e6f 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/dependent/BaseStatefulSet.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/dependent/BaseStatefulSet.java
@@ -14,7 +14,7 @@ public BaseStatefulSet(String component) {
   }
 
   @Override
-  protected StatefulSet desired(ComplexDependentCustomResource primary,
+  protected StatefulSet desired(ComplexDependentCustomResource primary, StatefulSet actual,
       Context<ComplexDependentCustomResource> context) {
     var template = ReconcilerUtils.loadYaml(StatefulSet.class, getClass(), "statefulset.yaml");
     var name = name(primary);
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalWithStateDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalWithStateDependentResource.java
index 6d2aa79ab3..eb0b442a37 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalWithStateDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalWithStateDependentResource.java
@@ -45,7 +45,7 @@ public Set<ExternalResource> fetchResources(
   }
 
   @Override
-  protected ExternalResource desired(ExternalStateCustomResource primary,
+  protected ExternalResource desired(ExternalStateCustomResource primary, ExternalResource actual,
       Context<ExternalStateCustomResource> context) {
     return new ExternalResource(primary.getSpec().getData());
   }
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminatorTestDRConfigMap.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminatorTestDRConfigMap.java
index 88dc40f55c..e8d79256e7 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminatorTestDRConfigMap.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminatorTestDRConfigMap.java
@@ -22,7 +22,7 @@ public IndexDiscriminatorTestDRConfigMap(String value) {
   }
 
   @Override
-  protected ConfigMap desired(IndexDiscriminatorTestCustomResource primary,
+  protected ConfigMap desired(IndexDiscriminatorTestCustomResource primary, ConfigMap actual,
       Context<IndexDiscriminatorTestCustomResource> context) {
     Map<String, String> data = new HashMap<>();
     data.put(DATA_KEY, primary.getSpec().getValue());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informerrelatedbehavior/ConfigMapDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informerrelatedbehavior/ConfigMapDependentResource.java
index c9747cbd00..0c333cde66 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informerrelatedbehavior/ConfigMapDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informerrelatedbehavior/ConfigMapDependentResource.java
@@ -20,7 +20,7 @@ public ConfigMapDependentResource() {
   }
 
   @Override
-  protected ConfigMap desired(InformerRelatedBehaviorTestCustomResource primary,
+  protected ConfigMap desired(InformerRelatedBehaviorTestCustomResource primary, ConfigMap actual,
       Context<InformerRelatedBehaviorTestCustomResource> context) {
     return new ConfigMapBuilder()
         .withMetadata(new ObjectMetaBuilder()
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentsametypemultiinformer/MultipleManagedDependentResourceMultiInformerConfigMap1.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentsametypemultiinformer/MultipleManagedDependentResourceMultiInformerConfigMap1.java
index 2a63b7267e..ee16b31490 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentsametypemultiinformer/MultipleManagedDependentResourceMultiInformerConfigMap1.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentsametypemultiinformer/MultipleManagedDependentResourceMultiInformerConfigMap1.java
@@ -23,6 +23,7 @@ public MultipleManagedDependentResourceMultiInformerConfigMap1() {
 
   @Override
   protected ConfigMap desired(MultipleManagedDependentResourceMultiInformerCustomResource primary,
+      ConfigMap actual,
       Context<MultipleManagedDependentResourceMultiInformerCustomResource> context) {
     Map<String, String> data = new HashMap<>();
     data.put(MultipleManagedDependentResourceReconciler.DATA_KEY, primary.getSpec().getValue());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentsametypemultiinformer/MultipleManagedDependentResourceMultiInformerConfigMap2.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentsametypemultiinformer/MultipleManagedDependentResourceMultiInformerConfigMap2.java
index 8db20cac14..783db9a601 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentsametypemultiinformer/MultipleManagedDependentResourceMultiInformerConfigMap2.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentsametypemultiinformer/MultipleManagedDependentResourceMultiInformerConfigMap2.java
@@ -24,6 +24,7 @@ public MultipleManagedDependentResourceMultiInformerConfigMap2() {
 
   @Override
   protected ConfigMap desired(MultipleManagedDependentResourceMultiInformerCustomResource primary,
+      ConfigMap actual,
       Context<MultipleManagedDependentResourceMultiInformerCustomResource> context) {
     Map<String, String> data = new HashMap<>();
     data.put(DATA_KEY, primary.getSpec().getValue());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceConfigMap1.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceConfigMap1.java
index 98f8033076..f3ccf2217a 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceConfigMap1.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceConfigMap1.java
@@ -22,6 +22,7 @@ public MultipleManagedDependentResourceConfigMap1() {
 
   @Override
   protected ConfigMap desired(MultipleManagedDependentResourceCustomResource primary,
+      ConfigMap actual,
       Context<MultipleManagedDependentResourceCustomResource> context) {
     Map<String, String> data = new HashMap<>();
     data.put(MultipleManagedDependentResourceReconciler.DATA_KEY, primary.getSpec().getValue());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceConfigMap2.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceConfigMap2.java
index d4cdd4170f..f7c8dceaa5 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceConfigMap2.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceConfigMap2.java
@@ -24,6 +24,7 @@ public MultipleManagedDependentResourceConfigMap2() {
 
   @Override
   protected ConfigMap desired(MultipleManagedDependentResourceCustomResource primary,
+      ConfigMap actual,
       Context<MultipleManagedDependentResourceCustomResource> context) {
     Map<String, String> data = new HashMap<>();
     data.put(DATA_KEY, primary.getSpec().getValue());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/restart/ConfigMapDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/restart/ConfigMapDependentResource.java
index edb4e2baff..04dfa18f91 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/restart/ConfigMapDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/restart/ConfigMapDependentResource.java
@@ -20,7 +20,7 @@ public ConfigMapDependentResource() {
   }
 
   @Override
-  protected ConfigMap desired(RestartTestCustomResource primary,
+  protected ConfigMap desired(RestartTestCustomResource primary, ConfigMap actual,
       Context<RestartTestCustomResource> context) {
     return new ConfigMapBuilder()
         .withMetadata(new ObjectMetaBuilder()

From 7cd244f7afd4d7f54db1c89e042216133e10fac9 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Tue, 31 Jan 2023 10:54:16 +0100
Subject: [PATCH 4/5] wip

---
 .../informerrelatedbehavior/ConfigMapDependentResource.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informerrelatedbehavior/ConfigMapDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informerrelatedbehavior/ConfigMapDependentResource.java
index 0c333cde66..bfce97bc4f 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informerrelatedbehavior/ConfigMapDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informerrelatedbehavior/ConfigMapDependentResource.java
@@ -30,6 +30,5 @@ protected ConfigMap desired(InformerRelatedBehaviorTestCustomResource primary, C
             .build())
         .withData(Map.of(DATA_KEY, primary.getMetadata().getName()))
         .build();
-
   }
 }

From 0fd76c6932fcff145378f12bfee6126dc9dfb0bf Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Tue, 31 Jan 2023 11:36:47 +0100
Subject: [PATCH 5/5] test fix

---
 .../AbstractExternalDependentResource.java                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/AbstractExternalDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/AbstractExternalDependentResource.java
index f7d3c91dd3..a6d3cb319a 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/AbstractExternalDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/AbstractExternalDependentResource.java
@@ -49,7 +49,7 @@ public ExternalResource update(ExternalResource actual,
   public Matcher.Result<ExternalResource> match(ExternalResource actualResource,
       MultipleManagedExternalDependentResourceCustomResource primary,
       Context<MultipleManagedExternalDependentResourceCustomResource> context) {
-    var desired = desired(primary, context);
+    var desired = desired(primary, actualResource, context);
     return Matcher.Result.computed(actualResource.equals(desired), desired);
   }
 
@@ -59,7 +59,9 @@ public void delete(MultipleManagedExternalDependentResourceCustomResource primar
     externalServiceMock.delete(toExternalResourceID(primary));
   }
 
+  @Override
   protected ExternalResource desired(MultipleManagedExternalDependentResourceCustomResource primary,
+      ExternalResource externalResource,
       Context<MultipleManagedExternalDependentResourceCustomResource> context) {
     return new ExternalResource(toExternalResourceID(primary),
         primary.getSpec().getValue());