Skip to content

Commit 930725a

Browse files
committed
fix: set finalizer name instead of using default to match expectations
1 parent 2f96320 commit 930725a

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ControllerUtilsTest {
2121
public void returnsValuesFromControllerAnnotationFinalizer() {
2222
final TestCustomResourceController controller = new TestCustomResourceController(null);
2323
final String finalizer = ControllerUtils.getFinalizer(controller);
24-
Assertions.assertEquals(ControllerUtils.getDefaultFinalizerIdentifier(controller), finalizer);
24+
Assertions.assertEquals(TestCustomResourceController.FINALIZER_NAME, finalizer);
2525
Assertions.assertTrue(HasMetadata.DOMAIN_NAME_MATCHER.reset(finalizer).matches());
2626
assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(controller));
2727
Assertions.assertEquals(TestCustomResourceController.CRD_NAME, ControllerUtils.getCrdName(controller));

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceController.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
import org.slf4j.LoggerFactory;
1818

1919
@Controller(
20-
generationAwareEventProcessing = false,
21-
crdName = TestCustomResourceController.CRD_NAME,
22-
customResourceClass = TestCustomResource.class)
20+
generationAwareEventProcessing = false,
21+
crdName = TestCustomResourceController.CRD_NAME,
22+
finalizerName = TestCustomResourceController.FINALIZER_NAME,
23+
customResourceClass = TestCustomResource.class)
2324
public class TestCustomResourceController implements ResourceController<TestCustomResource>, TestExecutionInfoProvider {
2425

2526
private static final Logger log = LoggerFactory.getLogger(TestCustomResourceController.class);

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceController.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,18 @@
1111
import org.slf4j.LoggerFactory;
1212

1313
@Controller(
14-
crdName = SubResourceTestCustomResourceController.CRD_NAME,
15-
customResourceClass = SubResourceTestCustomResource.class,
16-
generationAwareEventProcessing = false)
14+
crdName = SubResourceTestCustomResourceController.CRD_NAME,
15+
finalizerName = SubResourceTestCustomResourceController.FINALIZER_NAME,
16+
customResourceClass = SubResourceTestCustomResource.class,
17+
generationAwareEventProcessing = false)
1718
public class SubResourceTestCustomResourceController implements ResourceController<SubResourceTestCustomResource>,
1819
TestExecutionInfoProvider {
1920

2021
public static final String CRD_NAME = "subresourcesamples.sample.javaoperatorsdk";
2122
public static final String FINALIZER_NAME = CRD_NAME + ".io/finalizer";
2223
private static final Logger log = LoggerFactory.getLogger(SubResourceTestCustomResourceController.class);
2324
private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
24-
25+
2526
@Override
2627
public boolean deleteResource(SubResourceTestCustomResource resource, Context<SubResourceTestCustomResource> context) {
2728
return true;

0 commit comments

Comments
 (0)