Skip to content

🐛 report Archiving status when ClusterObjectSet teardown retries fail #3059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Oct 23, 2026
Merged

🐛 report Archiving status when ClusterObjectSet teardown retries fail #3059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions internal/object-controller/controllers/clusterobjectset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,10 @@ func (c *ClusterObjectSetReconciler) delete(ctx context.Context, cos *ocv1.Clust
func (c *ClusterObjectSetReconciler) archive(ctx context.Context, revisionEngine RevisionEngine, cos *ocv1.ClusterObjectSet, revision boxcutter.RevisionBuilder) (ctrl.Result, error) {
tdres, err := revisionEngine.Teardown(ctx, revision, machinerytypes.WithObserveAfterIncomplete{})
if err != nil {
// Transient teardown error: leave the Ready condition unchanged and return
// the error for rate-limited backoff.
// Teardown is still in progress: surface Archiving so the status reflects that
// cleanup has not completed (never Archived, which the deployment GC treats as
// torn-down), then return the error for rate-limited backoff.
markAsArchiving(cos)
return ctrl.Result{}, fmt.Errorf("error archiving revision: %v", err)
}
// Set object counts
Expand Down
12 changes: 8 additions & 4 deletions internal/object-controller/controllers/clusterobjectset_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_ArchivalAndDeletion(t *testing.T)
},
},
{
name: "return error and leave Ready untouched when archived revision teardown fails",
name: "set Ready:False:Archiving and return error when archived revision teardown fails",
revisionResult: newMockRevisionResult(mockCtrl, revisionResultConfig{}),
existingObjs: func() []client.Object {
ext := newTestClusterExtension()
Expand All @@ -1322,9 +1322,13 @@ func Test_ClusterObjectSetReconciler_Reconcile_ArchivalAndDeletion(t *testing.T)
Name: clusterObjectSetName,
}, rev)
require.NoError(t, err)
// A teardown error is transient: the error is returned for backoff and the
// Ready condition is left untouched (absent here).
require.Nil(t, meta.FindStatusCondition(rev.Status.Conditions, ocv1.ClusterObjectSetTypeReady))
// A teardown error means cleanup is still in progress: the error is returned
// for backoff and Ready reports Archiving (never Archived, which the deployment
// GC would treat as fully torn down).
cond := meta.FindStatusCondition(rev.Status.Conditions, ocv1.ClusterObjectSetTypeReady)
require.NotNil(t, cond)
require.Equal(t, metav1.ConditionFalse, cond.Status)
require.Equal(t, ocv1.ClusterObjectSetReasonArchiving, cond.Reason)

// Finalizer should still be present
require.Contains(t, rev.Finalizers, "olm.operatorframework.io/teardown")
Expand Down
Loading