Skip to content

Commit 4863a0a

Browse files
committed
removed update control for both subresource and resource update
1 parent 1f200f1 commit 4863a0a

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

operator-framework/src/main/java/com/github/containersolutions/operator/api/UpdateControl.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ private UpdateControl(T customResource, boolean updateStatusSubResource, boolean
1717
this.updateCustomResource = updateCustomResource;
1818
}
1919

20-
public static <T extends CustomResource> UpdateControl<T> updateStatusAndCustomResource(T customResource) {
21-
return new UpdateControl<>(customResource, true, true);
22-
}
23-
2420
public static <T extends CustomResource> UpdateControl<T> updateCustomResource(T customResource) {
2521
return new UpdateControl<>(customResource, false, true);
2622
}
@@ -44,4 +40,5 @@ public boolean isUpdateStatusSubResource() {
4440
public boolean isUpdateCustomResource() {
4541
return updateCustomResource;
4642
}
43+
4744
}

operator-framework/src/test/java/com/github/containersolutions/operator/EventDispatcherTest.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,6 @@ void updatesOnlyStatusSubResource() {
5454
verify(customResourceFacade, never()).replaceWithLock(any());
5555
}
5656

57-
@Test
58-
void updateStatusSubResourceAndCustomResource() {
59-
testCustomResource.getMetadata().getFinalizers().add(DEFAULT_FINALIZER);
60-
when(resourceController.createOrUpdateResource(eq(testCustomResource), any()))
61-
.thenReturn(UpdateControl.updateStatusAndCustomResource(testCustomResource));
62-
63-
eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.ADDED, testCustomResource));
64-
65-
verify(customResourceFacade, times(1)).updateStatus(testCustomResource);
66-
verify(customResourceFacade, times(1)).replaceWithLock(any());
67-
}
6857

6958
@Test
7059
void callCreateOrUpdateOnModifiedResource() {

0 commit comments

Comments
 (0)