Skip to content

Commit d32fbb9

Browse files
fix(Boxcutter): Re-resolve bundle when rollout is stuck
Generated-by: Cursor/Claude
1 parent eea6f95 commit d32fbb9

File tree

7 files changed

+745
-46
lines changed

7 files changed

+745
-46
lines changed

internal/operator-controller/controllers/boxcutter_reconcile_steps.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ func (d *BoxcutterRevisionStatesGetter) GetRevisionStates(ctx context.Context, e
6262
// is fairly decoupled from this code where we get the annotations back out. We may want to co-locate
6363
// the set/get logic a bit better to make it more maintainable and less likely to get out of sync.
6464
rm := &RevisionMetadata{
65-
RevisionName: rev.Name,
66-
Package: rev.Annotations[labels.PackageNameKey],
67-
Image: rev.Annotations[labels.BundleReferenceKey],
68-
Conditions: rev.Status.Conditions,
65+
RevisionName: rev.Name,
66+
Package: rev.Annotations[labels.PackageNameKey],
67+
Image: rev.Annotations[labels.BundleReferenceKey],
68+
SourceSpecHash: rev.Annotations[labels.SourceSpecHashKey],
69+
Conditions: rev.Status.Conditions,
6970
BundleMetadata: ocv1.BundleMetadata{
7071
Name: rev.Annotations[labels.BundleNameKey],
7172
Version: rev.Annotations[labels.BundleVersionKey],

internal/operator-controller/controllers/clusterextension_controller.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,10 @@ func clusterExtensionRequestsForCatalog(c client.Reader, logger logr.Logger) crh
497497
}
498498

499499
type RevisionMetadata struct {
500-
RevisionName string
501-
Package string
502-
Image string
500+
RevisionName string
501+
Package string
502+
Image string
503+
SourceSpecHash string
503504
ocv1.BundleMetadata
504505
Conditions []metav1.Condition
505506
}

0 commit comments

Comments
 (0)