Restore last-applied-config annotation in cache

This restores the last-applied-config annotation in the cache, as its
absense can cause issues with clients when we update our finalizers.

This increases memory utilization until we can solve the finalizer issue.

Also, since managedFields is needed by boxcutter (and was reverted from
being removed by another attempted memory optimization) add that field
into the accept list of sanitizeResources.

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

Author: tmshort

cmd/catalogd/main.go

@@ -59,7 +59,6 @@ import (
 	"github.com/operator-framework/operator-controller/internal/catalogd/storage"
 	"github.com/operator-framework/operator-controller/internal/catalogd/webhook"
 	sharedcontrollers "github.com/operator-framework/operator-controller/internal/shared/controllers"
-	cacheutil "github.com/operator-framework/operator-controller/internal/shared/util/cache"
 	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
 	httputil "github.com/operator-framework/operator-controller/internal/shared/util/http"
 	imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"
@@ -255,8 +254,6 @@ func run(ctx context.Context) error {
 
 	cacheOptions := crcache.Options{
 		ByObject: map[client.Object]crcache.ByObject{},
-		// Memory optimization: strip managed fields and large annotations from cached objects
-		DefaultTransform: cacheutil.StripManagedFieldsAndAnnotations(),
 	}
 
 	saKey, err := sautil.GetServiceAccount()

cmd/operator-controller/main.go

@@ -78,7 +78,6 @@ import (
 	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/render/registryv1"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/scheme"
 	sharedcontrollers "github.com/operator-framework/operator-controller/internal/shared/controllers"
-	cacheutil "github.com/operator-framework/operator-controller/internal/shared/util/cache"
 	fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"
 	httputil "github.com/operator-framework/operator-controller/internal/shared/util/http"
 	imageutil "github.com/operator-framework/operator-controller/internal/shared/util/image"
@@ -233,8 +232,6 @@ func run() error {
 			cfg.systemNamespace: {LabelSelector: k8slabels.Everything()},
 		},
 		DefaultLabelSelector: k8slabels.Nothing(),
-		// Memory optimization: strip managed fields and large annotations from cached objects
-		DefaultTransform: cacheutil.StripAnnotations(),
 	}
 
 	if features.OperatorControllerFeatureGate.Enabled(features.BoxcutterRuntime) {

internal/operator-controller/applier/boxcutter.go

@@ -28,7 +28,6 @@ import (
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/controllers"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/labels"
-	"github.com/operator-framework/operator-controller/internal/shared/util/cache"
 )
 
 const (
@@ -68,9 +67,6 @@ func (r *SimpleRevisionGenerator) GenerateRevisionFromHelmRelease(
 		maps.Copy(labels, objectLabels)
 		obj.SetLabels(labels)
 
-		// Memory optimization: strip large annotations
-		// Note: ApplyStripTransform never returns an error in practice
-		_ = cache.ApplyStripAnnotationsTransform(&obj)
 		sanitizedUnstructured(ctx, &obj)
 
 		objs = append(objs, ocv1.ClusterExtensionRevisionObject{
@@ -122,10 +118,6 @@ func (r *SimpleRevisionGenerator) GenerateRevision(
 		unstr := unstructured.Unstructured{Object: unstrObj}
 		unstr.SetGroupVersionKind(gvk)
 
-		// Memory optimization: strip large annotations
-		if err := cache.ApplyStripAnnotationsTransform(&unstr); err != nil {
-			return nil, err
-		}
 		sanitizedUnstructured(ctx, &unstr)
 
 		objs = append(objs, ocv1.ClusterExtensionRevisionObject{
@@ -155,6 +147,7 @@ func sanitizedUnstructured(ctx context.Context, unstr *unstructured.Unstructured
 	var allowedMetadata = []string{
 		"annotations",
 		"labels",
+		"managedFields",
 		"name",
 		"namespace",
 	}

internal/operator-controller/applier/boxcutter_test.go

@@ -89,6 +89,9 @@ func Test_SimpleRevisionGenerator_GenerateRevisionFromHelmRelease(t *testing.T)
 			Labels: map[string]string{
 				"olm.operatorframework.io/owner": "test-123",
 			},
+			ManagedFields: []metav1.ManagedFieldsEntry{
+				{Manager: "test-manager"},
+			},
 		},
 		Spec: ocv1.ClusterExtensionRevisionSpec{
 			Revision: 1,