Skip to content

🐛 OCPBUGS-62942: Register cleanup-contentmanager-cache finalizer for BoxcutterRun… #2304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

🐛 OCPBUGS-62942: Register cleanup-contentmanager-cache finalizer for BoxcutterRun… #2304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion cmd/operator-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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())
Expand All @@ -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())
Expand Down
Loading