patch related changes + IT fixes

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

Author: csviri

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

@@ -245,18 +245,6 @@ synchronized void eventProcessingFinished(
       state.markProcessedMarkForDeletion();
       metrics.cleanupDoneFor(resourceID, metricsMetadata);
     } else {
-      postExecutionControl
-          .getUpdatedCustomResource()
-          .ifPresent(
-              p -> {
-                // todo check
-                if (!postExecutionControl.updateIsStatusPatch()) {
-                  eventSourceManager
-                      .getControllerResourceEventSource()
-                      .handleRecentResourceUpdate(
-                          ResourceID.fromResource(p), p, executionScope.getResource());
-                }
-              });
       if (state.eventPresent()) {
         submitReconciliationExecution(state);
       } else {

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

@@ -453,7 +453,6 @@ public R patchResource(R resource, R originalResource) {
     public R patchStatus(R resource, R originalResource) {
       log.trace("Patching status for resource: {} with ssa: {}", resource, useSSA);
       String resourceVersion = resource.getMetadata().getResourceVersion();
-      // don't do optimistic locking on patch
       originalResource.getMetadata().setResourceVersion(null);
       resource.getMetadata().setResourceVersion(null);
       try {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java

@@ -286,22 +286,7 @@ void startProcessedMarkedEventReceivedBefore() {
     verify(reconciliationDispatcherMock, timeout(100).times(1)).handleExecution(any());
     verify(metricsMock, times(1)).reconcileCustomResource(any(HasMetadata.class), isNull(), any());
   }
-
-  @Test
-  void updatesEventSourceHandlerIfResourceUpdated() {
-    TestCustomResource customResource = testCustomResource();
-    ExecutionScope executionScope =
-        new ExecutionScope(null).setResource(customResource);
-    PostExecutionControl postExecutionControl =
-        PostExecutionControl.customResourcePatched(customResource);
-
-    eventProcessorWithRetry.eventProcessingFinished(executionScope, postExecutionControl);
-
-
-    verify(controllerResourceEventSourceMock, times(1)).handleRecentResourceUpdate(any(), any(),
-        any());
-  }
-
+  
   @Test
   void notUpdatesEventSourceHandlerIfResourceUpdated() {
     TestCustomResource customResource = testCustomResource();

operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusUpdateLockingIT.java

@@ -21,23 +21,27 @@ class StatusUpdateLockingIT {
 
   @RegisterExtension
   LocallyRunOperatorExtension operator =
-      LocallyRunOperatorExtension.builder().withReconciler(StatusUpdateLockingReconciler.class)
+      LocallyRunOperatorExtension.builder()
+          .withConfigurationService(o -> o.withUseSSAToPatchPrimaryResource(false))
+          .withReconciler(StatusUpdateLockingReconciler.class)
           .build();
 
   @Test
-  void optimisticLockingDoneOnStatusUpdate() throws InterruptedException {
+  void noOptimisticLockingDoneOnStatusPatch() throws InterruptedException {
     var resource = operator.create(createResource());
     Thread.sleep(WAIT_TIME / 2);
     resource.getMetadata().setAnnotations(Map.of("key", "value"));
     operator.replace(resource);
 
-    await().pollDelay(Duration.ofMillis(WAIT_TIME)).untilAsserted(() -> {
-      assertThat(
-          operator.getReconcilerOfType(StatusUpdateLockingReconciler.class).getNumberOfExecutions())
-          .isEqualTo(2);
-      assertThat(operator.get(StatusUpdateLockingCustomResource.class, TEST_RESOURCE_NAME)
-          .getStatus().getValue()).isEqualTo(1);
-    });
+    await().pollDelay(Duration.ofMillis(WAIT_TIME)).timeout(Duration.ofSeconds(460))
+        .untilAsserted(() -> {
+          assertThat(
+              operator.getReconcilerOfType(StatusUpdateLockingReconciler.class)
+                  .getNumberOfExecutions())
+              .isEqualTo(1);
+          assertThat(operator.get(StatusUpdateLockingCustomResource.class, TEST_RESOURCE_NAME)
+              .getStatus().getValue()).isEqualTo(1);
+        });
   }
 
   StatusUpdateLockingCustomResource createResource() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java

@@ -104,12 +104,16 @@ public UpdateControl<TestCustomResource> reconcile(
           .createOrReplace();
     }
     if (updateStatus) {
-      if (resource.getStatus() == null) {
-        resource.setStatus(new TestCustomResourceStatus());
-      }
+      var statusUpdateResource = new TestCustomResource();
+      statusUpdateResource.setMetadata(new ObjectMetaBuilder()
+          .withName(resource.getMetadata().getName())
+          .withNamespace(resource.getMetadata().getNamespace())
+          .build());
+      resource.setStatus(new TestCustomResourceStatus());
       resource.getStatus().setConfigMapStatus("ConfigMap Ready");
+      return UpdateControl.patchStatus(resource);
     }
-    return UpdateControl.patchStatus(resource);
+    return UpdateControl.noUpdate();
   }
 
   private Map<String, String> configMapData(TestCustomResource resource) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/statusupdatelocking/StatusUpdateLockingCustomResource.java

@@ -15,8 +15,4 @@ public class StatusUpdateLockingCustomResource
     extends CustomResource<Void, StatusUpdateLockingCustomResourceStatus>
     implements Namespaced {
 
-  @Override
-  protected StatusUpdateLockingCustomResourceStatus initStatus() {
-    return new StatusUpdateLockingCustomResourceStatus();
-  }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/statusupdatelocking/StatusUpdateLockingReconciler.java

@@ -18,6 +18,7 @@ public UpdateControl<StatusUpdateLockingCustomResource> reconcile(
       throws InterruptedException {
     numberOfExecutions.addAndGet(1);
     Thread.sleep(WAIT_TIME);
+    resource.setStatus(new StatusUpdateLockingCustomResourceStatus());
     resource.getStatus().setValue(resource.getStatus().getValue() + 1);
     return UpdateControl.patchStatus(resource);
   }