Skip to content

Commit a26842d

Browse files
csvirimetacosm
authored andcommitted
Revert "feature: update observed generation on updateResource"
This reverts commit 07f3053.
1 parent 3b97b6a commit a26842d

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,6 @@ 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-
}
157154
} else if (updateControl.isNoUpdate()
158155
&& shouldUpdateObservedGenerationAutomatically(resourceForExecution)) {
159156
updatedCustomResource = updateStatusGenerationAware(originalResource);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ 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);
6970
Controller<R> controller =
7071
new Controller<>(reconciler, configuration, null);
7172

0 commit comments

Comments
 (0)