Skip to content

Commit d73917b

Browse files
committed
fix: merge from master
1 parent 15badca commit d73917b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ private PostExecutionControl<R> reconcileExecution(ExecutionScope<R> executionSc
151151
updatedCustomResource = updateStatusGenerationAware(updateControl.getResource());
152152
} else if (updateControl.isUpdateResource()) {
153153
updatedCustomResource = updateCustomResource(updateControl.getResource());
154+
if (shouldUpdateObservedGenerationAutomatically(updatedCustomResource)) {
155+
updatedCustomResource = updateStatusGenerationAware(originalResource);
156+
}
154157
} else if (updateControl.isNoUpdate()
155158
&& shouldUpdateObservedGenerationAutomatically(resourceForExecution)) {
156159
updatedCustomResource = updateStatusGenerationAware(originalResource);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public <R extends HasMetadata> R clone(R object) {
6666
});
6767
when(reconciler.cleanup(eq(customResource), any()))
6868
.thenReturn(DeleteControl.defaultDelete());
69-
when(customResourceFacade.replaceWithLock(any())).thenReturn(null);
7069
Controller<R> controller =
7170
new Controller<>(reconciler, configuration, null);
7271

0 commit comments

Comments
 (0)