feature: update observed generation on updateResource (#731)

Author: csviri

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

@@ -151,6 +151,9 @@ private PostExecutionControl<R> reconcileExecution(ExecutionScope<R> executionSc
       updatedCustomResource = updateStatusGenerationAware(updateControl.getResource());
     } else if (updateControl.isUpdateResource()) {
       updatedCustomResource = updateCustomResource(updateControl.getResource());
+      if (shouldUpdateObservedGenerationAutomatically(updatedCustomResource)) {
+        updatedCustomResource = updateStatusGenerationAware(originalResource);
+      }
     } else if (updateControl.isNoUpdate()
         && shouldUpdateObservedGenerationAutomatically(resourceForExecution)) {
       updatedCustomResource = updateStatusGenerationAware(originalResource);

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

@@ -66,7 +66,6 @@ public <R extends HasMetadata> R clone(R object) {
     });
     when(reconciler.cleanup(eq(customResource), any()))
         .thenReturn(DeleteControl.defaultDelete());
-    when(customResourceFacade.replaceWithLock(any())).thenReturn(null);
     Controller<R> controller =
         new Controller<>(reconciler, configuration, null);
 
@@ -350,6 +349,27 @@ void updatesObservedGenerationOnNoUpdateUpdateControl() {
         .isEqualTo(1L);
   }
 
+  @Test
+  void updateObservedGenerationOnCustomResourceUpdate() {
+    var observedGenResource = createObservedGenCustomResource();
+
+    Reconciler<ObservedGenCustomResource> reconciler = mock(Reconciler.class);
+    ControllerConfiguration<ObservedGenCustomResource> config =
+        mock(ControllerConfiguration.class);
+    CustomResourceFacade<ObservedGenCustomResource> facade = mock(CustomResourceFacade.class);
+    when(config.isGenerationAware()).thenReturn(true);
+    when(reconciler.reconcile(any(), any()))
+        .thenReturn(UpdateControl.updateResource(observedGenResource));
+    when(facade.replaceWithLock(any())).thenReturn(observedGenResource);
+    when(facade.updateStatus(observedGenResource)).thenReturn(observedGenResource);
+    var dispatcher = init(observedGenResource, reconciler, config, facade);
+
+    PostExecutionControl<ObservedGenCustomResource> control = dispatcher.handleExecution(
+        executionScopeWithCREvent(observedGenResource));
+    assertThat(control.getUpdatedCustomResource().get().getStatus().getObservedGeneration())
+        .isEqualTo(1L);
+  }
+
   @Test
   void callErrorStatusHandlerIfImplemented() {
     testCustomResource.addFinalizer(DEFAULT_FINALIZER);