Skip to content

Commit 9c160a1

Browse files
committed
fix: use the controller's class canonical name as default finalizer name
1 parent f58e769 commit 9c160a1

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,17 @@
33
import io.fabric8.kubernetes.client.CustomResource;
44
import io.javaoperatorsdk.operator.api.Controller;
55
import io.javaoperatorsdk.operator.api.ResourceController;
6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
86

97

108
public class ControllerUtils {
11-
12-
private final static double JAVA_VERSION = Double.parseDouble(System.getProperty("java.specification.version"));
139
private static final String FINALIZER_NAME_SUFFIX = "/finalizer";
1410

1511
static String getFinalizer(ResourceController controller) {
1612
final String annotationFinalizerName = getAnnotation(controller).finalizerName();
1713
if (!Controller.NULL.equals(annotationFinalizerName)) {
1814
return annotationFinalizerName;
1915
}
20-
final String crdName = getAnnotation(controller).crdName() + FINALIZER_NAME_SUFFIX;
21-
return crdName;
16+
return controller.getClass().getCanonicalName() + FINALIZER_NAME_SUFFIX;
2217
}
2318

2419
static boolean getGenerationEventProcessing(ResourceController controller) {
@@ -36,8 +31,4 @@ static String getCrdName(ResourceController controller) {
3631
private static Controller getAnnotation(ResourceController controller) {
3732
return controller.getClass().getAnnotation(Controller.class);
3833
}
39-
40-
public static boolean hasGivenFinalizer(CustomResource resource, String finalizer) {
41-
return resource.getMetadata().getFinalizers() != null && resource.getMetadata().getFinalizers().contains(finalizer);
42-
}
4334
}

0 commit comments

Comments
 (0)