fix: Register cleanup-contentmanager-cache finalizer for BoxcutterRuntime (#2304)

When BoxcutterRuntime is enabled, ClusterExtensions created with the Helm
runtime still have the cleanup-contentmanager-cache finalizer, but the
finalizer handler is not registered in setupBoxcutter(). This causes
ClusterExtension deletions to hang indefinitely.

This commit registers a no-op finalizer handler in setupBoxcutter() to
allow deletion of ClusterExtensions that were created before BoxcutterRuntime
was enabled. Since Boxcutter doesn't use contentmanager (it has its own
tracking mechanism), no actual cleanup is needed.


Assisted-by: Claude code

Signed-off-by: Todd Short <tshort@redhat.com>

Author: tmshort

cmd/operator-controller/main.go

@@ -460,7 +460,7 @@ func run() error {
 	}
 
 	if features.OperatorControllerFeatureGate.Enabled(features.BoxcutterRuntime) {
-		err = setupBoxcutter(mgr, ceReconciler, preflights, regv1ManifestProvider)
+		err = setupBoxcutter(mgr, ceReconciler, preflights, clusterExtensionFinalizers, regv1ManifestProvider)
 	} else {
 		err = setupHelm(mgr, ceReconciler, preflights, ceController, clusterExtensionFinalizers, regv1ManifestProvider)
 	}
@@ -527,6 +527,7 @@ func setupBoxcutter(
 	mgr manager.Manager,
 	ceReconciler *controllers.ClusterExtensionReconciler,
 	preflights []applier.Preflight,
+	clusterExtensionFinalizers crfinalizer.Registerer,
 	regv1ManifestProvider applier.ManifestProvider,
 ) error {
 	coreClient, err := corev1client.NewForConfig(mgr.GetConfig())
@@ -551,6 +552,19 @@ func setupBoxcutter(
 		return fmt.Errorf("unable to create helm action client getter: %w", err)
 	}
 
+	// Register a no-op finalizer handler for cleanup-contentmanager-cache.
+	// This finalizer was added by the Helm applier for ClusterExtensions created
+	// before BoxcutterRuntime was enabled. Boxcutter doesn't use contentmanager,
+	// so we just need to acknowledge the finalizer to allow deletion to proceed.
+	err = clusterExtensionFinalizers.Register(controllers.ClusterExtensionCleanupContentManagerCacheFinalizer, finalizers.FinalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {
+		// No-op: Boxcutter doesn't use contentmanager, so no cleanup is needed
+		return crfinalizer.Result{}, nil
+	}))
+	if err != nil {
+		setupLog.Error(err, "unable to register content manager cleanup finalizer for boxcutter")
+		return err
+	}
+
 	// TODO: add support for preflight checks
 	// TODO: better scheme handling - which types do we want to support?
 	_ = apiextensionsv1.AddToScheme(mgr.GetScheme())