fix(Boxcutter): Re-resolve bundle when rollout is stuck

Implements catalog spec digest tracking to detect spec changes during stuck
rollouts, enabling recovery by updating the ClusterExtension spec.

**Problem**: When a ClusterExtension rollout gets stuck (e.g., bad image causing
probe failures), updating the spec to a different version doesn't trigger
re-resolution. The controller reuses the stuck revision indefinitely.

**Solution**: Track a digest of resolution-relevant spec fields
(packageName, version, channels, selector, upgradeConstraintPolicy) in
ClusterObjectSet annotations. When spec changes during rollout, detect
digest mismatch and trigger re-resolution to create a new revision.

Generated-by: Claude

Author: camilamacedo86

internal/operator-controller/controllers/boxcutter_reconcile_steps.go

@@ -62,10 +62,11 @@ func (d *BoxcutterRevisionStatesGetter) GetRevisionStates(ctx context.Context, e
 		//   is fairly decoupled from this code where we get the annotations back out. We may want to co-locate
 		//   the set/get logic a bit better to make it more maintainable and less likely to get out of sync.
 		rm := &RevisionMetadata{
-			RevisionName: rev.Name,
-			Package:      rev.Annotations[labels.PackageNameKey],
-			Image:        rev.Annotations[labels.BundleReferenceKey],
-			Conditions:   rev.Status.Conditions,
+			RevisionName:      rev.Name,
+			Package:           rev.Annotations[labels.PackageNameKey],
+			Image:             rev.Annotations[labels.BundleReferenceKey],
+			CatalogSpecDigest: rev.Annotations[labels.CatalogSpecDigestKey],
+			Conditions:        rev.Status.Conditions,
 			BundleMetadata: ocv1.BundleMetadata{
 				Name:    rev.Annotations[labels.BundleNameKey],
 				Version: rev.Annotations[labels.BundleVersionKey],
@@ -104,10 +105,11 @@ func ApplyBundleWithBoxcutter(apply func(ctx context.Context, contentFS fs.FS, e
 	return func(ctx context.Context, state *reconcileState, ext *ocv1.ClusterExtension) (*ctrl.Result, error) {
 		l := log.FromContext(ctx)
 		revisionAnnotations := map[string]string{
-			labels.BundleNameKey:      state.resolvedRevisionMetadata.Name,
-			labels.PackageNameKey:     state.resolvedRevisionMetadata.Package,
-			labels.BundleVersionKey:   state.resolvedRevisionMetadata.Version,
-			labels.BundleReferenceKey: state.resolvedRevisionMetadata.Image,
+			labels.BundleNameKey:        state.resolvedRevisionMetadata.Name,
+			labels.PackageNameKey:       state.resolvedRevisionMetadata.Package,
+			labels.BundleVersionKey:     state.resolvedRevisionMetadata.Version,
+			labels.BundleReferenceKey:   state.resolvedRevisionMetadata.Image,
+			labels.CatalogSpecDigestKey: CatalogSpecDigest(ext),
 		}
 		if state.resolvedRevisionMetadata.Release != nil {
 			revisionAnnotations[labels.BundleReleaseKey] = *state.resolvedRevisionMetadata.Release

internal/operator-controller/controllers/clusterextension_controller.go

@@ -499,9 +499,10 @@ func clusterExtensionRequestsForCatalog(c client.Reader, logger logr.Logger) crh
 }
 
 type RevisionMetadata struct {
-	RevisionName string
-	Package      string
-	Image        string
+	RevisionName      string
+	Package           string
+	Image             string
+	CatalogSpecDigest string
 	ocv1.BundleMetadata
 	Conditions []metav1.Condition
 }