Skip to content

Commit 429d19a

Browse files
fix(Boxcutter): Re-resolve bundle when rollout is stuck
1 parent 74e39f5 commit 429d19a

7 files changed

Lines changed: 880 additions & 106 deletions

File tree

internal/operator-controller/controllers/boxcutter_reconcile_steps.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ func (d *BoxcutterRevisionStatesGetter) GetRevisionStates(ctx context.Context, e
6565
RevisionName: rev.Name,
6666
Package: rev.Annotations[labels.PackageNameKey],
6767
Image: rev.Annotations[labels.BundleReferenceKey],
68+
SourceDigest: rev.Annotations[labels.SourceDigestKey],
6869
Conditions: rev.Status.Conditions,
6970
BundleMetadata: ocv1.BundleMetadata{
7071
Name: rev.Annotations[labels.BundleNameKey],
@@ -108,6 +109,7 @@ func ApplyBundleWithBoxcutter(apply func(ctx context.Context, contentFS fs.FS, e
108109
labels.PackageNameKey: state.resolvedRevisionMetadata.Package,
109110
labels.BundleVersionKey: state.resolvedRevisionMetadata.Version,
110111
labels.BundleReferenceKey: state.resolvedRevisionMetadata.Image,
112+
labels.SourceDigestKey: CatalogSpecDigest(ext),
111113
}
112114
if state.resolvedRevisionMetadata.Release != nil {
113115
revisionAnnotations[labels.BundleReleaseKey] = *state.resolvedRevisionMetadata.Release

internal/operator-controller/controllers/clusterextension_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ type RevisionMetadata struct {
502502
RevisionName string
503503
Package string
504504
Image string
505+
SourceDigest string
505506
ocv1.BundleMetadata
506507
Conditions []metav1.Condition
507508
}

0 commit comments

Comments
 (0)