Skip to content

Commit 37f46bb

Browse files
committed
Revert "feature: update observed generation on updateResource"
This reverts commit 07f3053.
1 parent 80ead17 commit 37f46bb

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
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 & 21 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

@@ -349,27 +350,6 @@ void updatesObservedGenerationOnNoUpdateUpdateControl() {
349350
.isEqualTo(1L);
350351
}
351352

352-
@Test
353-
void updateObservedGenerationOnCustomResourceUpdate() {
354-
var observedGenResource = createObservedGenCustomResource();
355-
356-
Reconciler<ObservedGenCustomResource> reconciler = mock(Reconciler.class);
357-
ControllerConfiguration<ObservedGenCustomResource> config =
358-
mock(ControllerConfiguration.class);
359-
CustomResourceFacade<ObservedGenCustomResource> facade = mock(CustomResourceFacade.class);
360-
when(config.isGenerationAware()).thenReturn(true);
361-
when(reconciler.reconcile(any(), any()))
362-
.thenReturn(UpdateControl.updateResource(observedGenResource));
363-
when(facade.replaceWithLock(any())).thenReturn(observedGenResource);
364-
when(facade.updateStatus(observedGenResource)).thenReturn(observedGenResource);
365-
var dispatcher = init(observedGenResource, reconciler, config, facade);
366-
367-
PostExecutionControl<ObservedGenCustomResource> control = dispatcher.handleExecution(
368-
executionScopeWithCREvent(observedGenResource));
369-
assertThat(control.getUpdatedCustomResource().get().getStatus().getObservedGeneration())
370-
.isEqualTo(1L);
371-
}
372-
373353
@Test
374354
void callErrorStatusHandlerIfImplemented() {
375355
testCustomResource.addFinalizer(DEFAULT_FINALIZER);

0 commit comments

Comments
 (0)