Skip to content

Commit 5800c7f

Browse files
authored
Define a constant for the finaliser key (#1209)
Signed-off-by: Mikalai Radchuk <[email protected]>
1 parent 4aa7bff commit 5800c7f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

cmd/manager/main.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,10 @@ func main() {
200200
}
201201

202202
clusterExtensionFinalizers := crfinalizer.NewFinalizers()
203-
domain := ocv1alpha1.GroupVersion.Group
204-
cleanupUnpackCacheKey := fmt.Sprintf("%s/cleanup-unpack-cache", domain)
205-
if err := clusterExtensionFinalizers.Register(cleanupUnpackCacheKey, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {
203+
if err := clusterExtensionFinalizers.Register(controllers.ClusterExtensionCleanupUnpackCacheFinalizer, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {
206204
return crfinalizer.Result{}, os.RemoveAll(filepath.Join(unpacker.BaseCachePath, obj.GetName()))
207205
})); err != nil {
208-
setupLog.Error(err, "unable to register finalizer", "finalizerKey", cleanupUnpackCacheKey)
206+
setupLog.Error(err, "unable to register finalizer", "finalizerKey", controllers.ClusterExtensionCleanupUnpackCacheFinalizer)
209207
os.Exit(1)
210208
}
211209

internal/controllers/clusterextension_controller.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ import (
5757
rukpaksource "github.com/operator-framework/operator-controller/internal/rukpak/source"
5858
)
5959

60+
const (
61+
ClusterExtensionCleanupUnpackCacheFinalizer = "olm.operatorframework.io/cleanup-unpack-cache"
62+
)
63+
6064
// ClusterExtensionReconciler reconciles a ClusterExtension object
6165
type ClusterExtensionReconciler struct {
6266
client.Client

0 commit comments

Comments
 (0)