Use getDefaultFinalizerName in the code to get the controller finalizer name.

Author: Soroosh Sarabadani

operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -55,7 +55,7 @@ private <R extends CustomResource> void registerController(ResourceController<R>
         Class<R> resClass = ControllerUtils.getCustomResourceClass(controller);
         CustomResourceDefinitionContext crd = getCustomResourceDefinitionForController(controller);
         KubernetesDeserializer.registerCustomKind(crd.getVersion(), crd.getKind(), resClass);
-        String finalizer = ControllerUtils.getDefaultFinalizer(controller);
+        String finalizer = ControllerUtils.getFinalizer(controller);
         MixedOperation client = k8sClient.customResources(crd, resClass, CustomResourceList.class, ControllerUtils.getCustomResourceDoneableClass(controller));
         EventDispatcher eventDispatcher = new EventDispatcher(controller,
                 finalizer, new EventDispatcher.CustomResourceFacade(client), ControllerUtils.getGenerationEventProcessing(controller));

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

@@ -28,7 +28,7 @@ class EventDispatcherTest {
     @BeforeEach
     void setup() {
         eventDispatcher = new EventDispatcher(controller,
-                Controller.DEFAULT_FINALIZER, customResourceFacade, false);
+                controller.getDefaultFinalizerName(), customResourceFacade, false);
 
         testCustomResource = getResource();
 
@@ -45,7 +45,7 @@ void callCreateOrUpdateOnNewResource() {
 
     @Test
     void updatesOnlyStatusSubResource() {
-        testCustomResource.getMetadata().getFinalizers().add(Controller.DEFAULT_FINALIZER);
+        testCustomResource.getMetadata().getFinalizers().add(controller.getDefaultFinalizerName());
         when(controller.createOrUpdateResource(eq(testCustomResource), any()))
                 .thenReturn(UpdateControl.updateStatusSubResource(testCustomResource));
 
@@ -67,13 +67,13 @@ void adsDefaultFinalizerOnCreateIfNotThere() {
         eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource));
         verify(controller, times(1))
                 .createOrUpdateResource(argThat(testCustomResource ->
-                        testCustomResource.getMetadata().getFinalizers().contains(Controller.DEFAULT_FINALIZER)), any());
+                        testCustomResource.getMetadata().getFinalizers().contains(controller.getDefaultFinalizerName())), any());
     }
 
     @Test
     void callsDeleteIfObjectHasFinalizerAndMarkedForDelete() {
         testCustomResource.getMetadata().setDeletionTimestamp("2019-8-10");
-        testCustomResource.getMetadata().getFinalizers().add(Controller.DEFAULT_FINALIZER);
+        testCustomResource.getMetadata().getFinalizers().add(controller.getDefaultFinalizerName());
 
         eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource));
 
@@ -183,7 +183,7 @@ void doesNotMarkNewGenerationInCaseOfException() {
 
     void generationAwareMode() {
         eventDispatcher = new EventDispatcher(controller,
-                Controller.DEFAULT_FINALIZER, customResourceFacade, true);
+                controller.getDefaultFinalizerName(), customResourceFacade, true);
     }
 
     private void markForDeletion(CustomResource customResource) {
@@ -202,7 +202,7 @@ CustomResource getResource() {
                 .withDeletionGracePeriodSeconds(10L)
                 .withGeneration(10L)
                 .withName("name")
-                .withFinalizers(Controller.DEFAULT_FINALIZER)
+                .withFinalizers(controller.getDefaultFinalizerName())
                 .withNamespace("namespace")
                 .withResourceVersion("resourceVersion")
                 .withSelfLink("selfLink")

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

@@ -104,7 +104,7 @@ public SubResourceTestCustomResource createTestCustomResource(String id) {
         resource.setMetadata(new ObjectMetaBuilder()
                 .withName("subresource-" + id)
                 .withNamespace(TEST_NAMESPACE)
-                .withFinalizers(Controller.DEFAULT_FINALIZER)
+                .withFinalizers("finalizer")
                 .build());
         resource.setKind("SubresourceSample");
         resource.setSpec(new SubResourceTestCustomResourceSpec());

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

@@ -55,7 +55,7 @@ public boolean deleteResource(TestCustomResource resource, Context<TestCustomRes
     public UpdateControl<TestCustomResource> createOrUpdateResource(TestCustomResource resource,
                                                                     Context<TestCustomResource> context) {
         numberOfExecutions.addAndGet(1);
-        if (!resource.getMetadata().getFinalizers().contains(Controller.DEFAULT_FINALIZER)) {
+        if (!resource.getMetadata().getFinalizers().contains(this.getDefaultFinalizerName())) {
             throw new IllegalStateException("Finalizer is not present.");
         }
 

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

@@ -19,7 +19,7 @@ public class SubResourceTestCustomResourceController implements ResourceControll
 
     public static final String CRD_NAME = "subresourcesample.sample.javaoperatorsdk";
     private static final Logger log = LoggerFactory.getLogger(SubResourceTestCustomResourceController.class);
-    private AtomicInteger numberOfExecutions = new AtomicInteger(0);
+    private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
     @Override
     public boolean deleteResource(SubResourceTestCustomResource resource, Context<SubResourceTestCustomResource> context) {
@@ -30,7 +30,7 @@ public boolean deleteResource(SubResourceTestCustomResource resource, Context<Su
     public UpdateControl<SubResourceTestCustomResource> createOrUpdateResource(SubResourceTestCustomResource resource,
                                                                                Context<SubResourceTestCustomResource> context) {
         numberOfExecutions.addAndGet(1);
-        if (!resource.getMetadata().getFinalizers().contains(Controller.DEFAULT_FINALIZER)) {
+        if (!resource.getMetadata().getFinalizers().contains(this.getDefaultFinalizerName())) {
             throw new IllegalStateException("Finalizer is not present.");
         }
         log.info("Value: " + resource.getSpec().getValue());