fix IT

Signed-off-by: Attila Mészáros <csviri@gmail.com>

Author: csviri

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

@@ -1,6 +1,5 @@
 package io.javaoperatorsdk.operator.processing.event;
 
-import java.util.Collections;
 import java.util.function.Function;
 
 import org.slf4j.Logger;
@@ -421,7 +420,7 @@ public R patchStatus(R resource, R originalResource) {
           var managedFields = resource.getMetadata().getManagedFields();
           try {
 
-            resource.getMetadata().setManagedFields(Collections.emptyList());
+            resource.getMetadata().setManagedFields(null);
             var res = resource(resource);
             return res.subresource("status").patch(new PatchContext.Builder()
                 .withFieldManager(fieldManager)

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusPatchNotLockingIT.java

@@ -48,7 +48,7 @@ void noOptimisticLockingDoneOnStatusUpdate() throws InterruptedException {
 
   // see https://github.com/fabric8io/kubernetes-client/issues/4158
   @Test
-  void valuesAreDeletedIfSetToNull() {
+  void valuesAreDeletedIfSetToNull() throws InterruptedException {
     var resource = operator.create(createResource());
 
     await().untilAsserted(() -> {
@@ -58,10 +58,12 @@ void valuesAreDeletedIfSetToNull() {
       assertThat(actual.getStatus().getMessage()).isEqualTo(MESSAGE);
     });
 
+    // resource needs to be read again to we don't replace the with wrong managed fields
+    resource = operator.get(StatusPatchLockingCustomResource.class, TEST_RESOURCE_NAME);
     resource.getSpec().setMessageInStatus(false);
     operator.replace(resource);
 
-    await().untilAsserted(() -> {
+    await().timeout(Duration.ofMinutes(3)).untilAsserted(() -> {
       var actual = operator.get(StatusPatchLockingCustomResource.class,
           TEST_RESOURCE_NAME);
       assertThat(actual.getStatus()).isNotNull();