fix: actually create a valid finalizer name and check it is

Author: metacosm

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

@@ -6,7 +6,7 @@
 
 
 public class ControllerUtils {
-    private static final String FINALIZER_NAME_SUFFIX = "/finalizer";
+    private static final String FINALIZER_NAME_SUFFIX = ".javaoperatorsdk.io/finalizer";
 
     static String getFinalizer(ResourceController controller) {
         final String annotationFinalizerName = getAnnotation(controller).finalizerName();
@@ -17,7 +17,8 @@ static String getFinalizer(ResourceController controller) {
     }
 
     static String getDefaultFinalizerIdentifier(ResourceController controller) {
-        return controller.getClass().getCanonicalName() + FINALIZER_NAME_SUFFIX;
+        final Class<? extends ResourceController> controllerClass = controller.getClass();
+        return controllerClass.getSimpleName().toLowerCase() + FINALIZER_NAME_SUFFIX;
     }
 
     static boolean getGenerationEventProcessing(ResourceController controller) {

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

@@ -1,10 +1,15 @@
 package io.javaoperatorsdk.operator;
 
-import io.javaoperatorsdk.operator.sample.TestCustomResource;
-import io.javaoperatorsdk.operator.sample.TestCustomResourceController;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
 import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.operator.sample.TestCustomResource;
+import io.javaoperatorsdk.operator.sample.TestCustomResourceController;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -13,10 +18,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -32,8 +33,9 @@ public class ConcurrencyIT {
     @BeforeAll
     public void setup() {
         KubernetesClient k8sClient = new DefaultKubernetesClient();
-        integrationTest.initialize(k8sClient, new TestCustomResourceController(k8sClient, true),
-                "test-crd.yaml");
+        final TestCustomResourceController controller = new TestCustomResourceController(k8sClient, true);
+        assertThat(HasMetadata.DOMAIN_NAME_MATCHER.reset(ControllerUtils.getDefaultFinalizerIdentifier(controller)).matches()).isTrue();
+        integrationTest.initialize(k8sClient, controller, "test-crd.yaml");
     }
 
     @BeforeEach

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

@@ -1,5 +1,6 @@
 package io.javaoperatorsdk.operator;
 
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.ResourceController;
@@ -19,7 +20,9 @@ class ControllerUtilsTest {
     @Test
     public void returnsValuesFromControllerAnnotationFinalizer() {
         final TestCustomResourceController controller = new TestCustomResourceController(null);
-        Assertions.assertEquals(ControllerUtils.getDefaultFinalizerIdentifier(controller), ControllerUtils.getFinalizer(controller));
+        final String finalizer = ControllerUtils.getFinalizer(controller);
+        Assertions.assertEquals(ControllerUtils.getDefaultFinalizerIdentifier(controller), finalizer);
+        Assertions.assertTrue(HasMetadata.DOMAIN_NAME_MATCHER.reset(finalizer).matches());
         assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(controller));
         Assertions.assertEquals(TestCustomResourceController.CRD_NAME, ControllerUtils.getCrdName(controller));
         assertFalse(ControllerUtils.getGenerationEventProcessing(controller));

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

@@ -2,13 +2,15 @@
 
 import java.util.concurrent.TimeUnit;
 
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResource;
 import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceController;
 import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceSpec;
 import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceStatus;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -19,17 +21,21 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SubResourceUpdateIT {
-
+    
     private IntegrationTestSupport integrationTestSupport = new IntegrationTestSupport();
-
+    
+    @BeforeAll
+    void checkFinalizer() {
+        assertThat(HasMetadata.DOMAIN_NAME_MATCHER.reset(ControllerUtils.getDefaultFinalizerIdentifier(new SubResourceTestCustomResourceController())).matches()).isTrue();
+    }
+    
     @BeforeEach
     public void initAndCleanup() {
         KubernetesClient k8sClient = new DefaultKubernetesClient();
-        integrationTestSupport.initialize(k8sClient, new SubResourceTestCustomResourceController(),
-                "subresource-test-crd.yaml");
+        integrationTestSupport.initialize(k8sClient, new SubResourceTestCustomResourceController(), "subresource-test-crd.yaml");
         integrationTestSupport.cleanup();
     }
-
+    
     @Test
     public void updatesSubResourceStatus() {
         integrationTestSupport.teardownIfSuccess(() -> {