update

Author: csviri

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);

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;
     }
 

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);
   }
 }

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");
 

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);

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());
   }

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());

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()

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());

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());