post-rebase finalizer key fix

everettraven · everettraven · commit 051a24ac261a · 2024-09-04T08:27:36.000-04:00
Signed-off-by: everettraven &lt;everettraven@gmail.com&gt;
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -250,8 +250,7 @@ func main() {
 	}
 
 	cm := contentmanager.NewManager(clientRestConfigMapper, mgr.GetConfig(), mgr.GetRESTMapper())
-	contentManagerFinalizerKey := fmt.Sprintf("%s/contentmanager-cleanup", domain)
-	err = clusterExtensionFinalizers.Register(contentManagerFinalizerKey, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {
+	err = clusterExtensionFinalizers.Register(controllers.ClusterExtensionCleanupContentManagerCacheFinalizer, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {
 		ext := obj.(*ocv1alpha1.ClusterExtension)
 		err := cm.Delete(ext)
 		return crfinalizer.Result{}, err
diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
@@ -58,6 +58,7 @@ import (
 
 const (
 	ClusterExtensionCleanupUnpackCacheFinalizer = "olm.operatorframework.io/cleanup-unpack-cache"
+    ClusterExtensionCleanupContentManagerCacheFinalizer = "olm.operatorframework.io/cleanup-contentmanager-cache"
 )
 
 // ClusterExtensionReconciler reconciles a ClusterExtension object

Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,7 @@ func main() {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`cm := contentmanager.NewManager(clientRestConfigMapper, mgr.GetConfig(), mgr.GetRESTMapper())`
`253`		`- contentManagerFinalizerKey := fmt.Sprintf("%s/contentmanager-cleanup", domain)`
`254`		`- err = clusterExtensionFinalizers.Register(contentManagerFinalizerKey, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {`
	`253`	`+ err = clusterExtensionFinalizers.Register(controllers.ClusterExtensionCleanupContentManagerCacheFinalizer, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {`
`255`	`254`	`ext := obj.(*ocv1alpha1.ClusterExtension)`
`256`	`255`	`err := cm.Delete(ext)`
`257`	`256`	`return crfinalizer.Result{}, err`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ import (`
`58`	`58`
`59`	`59`	`const (`
`60`	`60`	`ClusterExtensionCleanupUnpackCacheFinalizer = "olm.operatorframework.io/cleanup-unpack-cache"`
	`61`	`+ ClusterExtensionCleanupContentManagerCacheFinalizer = "olm.operatorframework.io/cleanup-contentmanager-cache"`
`61`	`62`	`)`
`62`	`63`
`63`	`64`	`// ClusterExtensionReconciler reconciles a ClusterExtension object`