fix: patchResourceAndStatus on status patch should generate diff only from status

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

Author: csviri

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

@@ -10,6 +10,7 @@
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
@@ -477,6 +478,7 @@ public R patchStatus(R resource, R originalResource) {
       }
     }
 
+    @SuppressWarnings("unchecked")
     private R editStatus(R resource, R originalResource) {
       String resourceVersion = resource.getMetadata().getResourceVersion();
       // the cached resource should not be changed in any circumstances
@@ -486,7 +488,11 @@ private R editStatus(R resource, R originalResource) {
         clonedOriginal.getMetadata().setResourceVersion(null);
         resource.getMetadata().setResourceVersion(null);
         var res = resource(clonedOriginal);
-        return res.editStatus(r -> resource);
+        return res.editStatus(
+            r -> {
+              ((CustomResource) r).setStatus(((CustomResource) resource).getStatus());
+              return r;
+            });
       } finally {
         // restore initial resource version
         clonedOriginal.getMetadata().setResourceVersion(resourceVersion);

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourceandstatusnossa/PatchResourceAndStatusNoSSAIT.java

@@ -39,12 +39,7 @@ void updatesSubResourceStatus() {
     assertThat(TestUtils.getNumberOfExecutions(operator)).isEqualTo(1);
     assertThat(customResource.getStatus().getState())
         .isEqualTo(PatchResourceAndStatusNoSSAStatus.State.SUCCESS);
-    assertThat(
-            customResource
-                .getMetadata()
-                .getAnnotations()
-                .get(TEST_ANNOTATION))
-        .isNotNull();
+    assertThat(customResource.getMetadata().getAnnotations().get(TEST_ANNOTATION)).isNotNull();
   }
 
   void awaitStatusUpdated(String name) {
@@ -65,7 +60,7 @@ public PatchResourceAndStatusNoSSACustomResource createTestCustomResource(String
     PatchResourceAndStatusNoSSACustomResource resource =
         new PatchResourceAndStatusNoSSACustomResource();
     resource.setMetadata(new ObjectMetaBuilder().withName("doubleupdateresource-" + id).build());
-    resource.getMetadata().setAnnotations(Map.of(TEST_ANNOTATION,TEST_ANNOTATION_VALUE));
+    resource.getMetadata().setAnnotations(Map.of(TEST_ANNOTATION, TEST_ANNOTATION_VALUE));
     resource.setSpec(new PatchResourceAndStatusNoSSASpec());
     resource.getSpec().setValue(id);
     return resource;

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourceandstatusnossa/PatchResourceAndStatusNoSSAReconciler.java

@@ -1,6 +1,5 @@
 package io.javaoperatorsdk.operator.baseapi.patchresourceandstatusnossa;
 
-import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.slf4j.Logger;