diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 5ae7aa97f..9f2e93678 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -200,12 +200,10 @@ func main() { } clusterExtensionFinalizers := crfinalizer.NewFinalizers() - domain := ocv1alpha1.GroupVersion.Group - cleanupUnpackCacheKey := fmt.Sprintf("%s/cleanup-unpack-cache", domain) - if err := clusterExtensionFinalizers.Register(cleanupUnpackCacheKey, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) { + if err := clusterExtensionFinalizers.Register(controllers.ClusterExtensionCleanupUnpackCacheFinalizer, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) { return crfinalizer.Result{}, os.RemoveAll(filepath.Join(unpacker.BaseCachePath, obj.GetName())) })); err != nil { - setupLog.Error(err, "unable to register finalizer", "finalizerKey", cleanupUnpackCacheKey) + setupLog.Error(err, "unable to register finalizer", "finalizerKey", controllers.ClusterExtensionCleanupUnpackCacheFinalizer) os.Exit(1) } diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go index 5da683af4..176a5dc6e 100644 --- a/internal/controllers/clusterextension_controller.go +++ b/internal/controllers/clusterextension_controller.go @@ -57,6 +57,10 @@ import ( rukpaksource "github.com/operator-framework/operator-controller/internal/rukpak/source" ) +const ( + ClusterExtensionCleanupUnpackCacheFinalizer = "olm.operatorframework.io/cleanup-unpack-cache" +) + // ClusterExtensionReconciler reconciles a ClusterExtension object type ClusterExtensionReconciler struct { client.Client