Skip to content

🐛 Use ClusterObjectSet revision numbers in rollout status messages #2963

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 1, 2026
Merged

🐛 Use ClusterObjectSet revision numbers in rollout status messages #2963

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
10 changes: 5 additions & 5 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 @@ -224,9 +224,9 @@ func (c *ClusterObjectSetReconciler) reconcile(ctx context.Context, cos *ocv1.Cl
}
}

revVersion := cos.GetAnnotations()[labels.BundleVersionKey]
revisionNumber := cos.Spec.Revision
if rres.InTransition() {
markAsProgressing(l, cos, ocv1.ReasonRollingOut, fmt.Sprintf("Revision %s is rolling out.", revVersion), isDeadlineExceeded)
markAsProgressing(l, cos, ocv1.ReasonRollingOut, fmt.Sprintf("Revision %d is rolling out.", revisionNumber), isDeadlineExceeded)
}

//nolint:nestif
Expand All @@ -246,7 +246,7 @@ func (c *ClusterObjectSetReconciler) reconcile(ctx context.Context, cos *ocv1.Cl
}
}

markAsProgressing(l, cos, ocv1.ReasonSucceeded, fmt.Sprintf("Revision %s has rolled out.", revVersion), isDeadlineExceeded)
markAsProgressing(l, cos, ocv1.ReasonSucceeded, fmt.Sprintf("Revision %d has rolled out.", revisionNumber), isDeadlineExceeded)
markAsAvailable(cos, ocv1.ClusterObjectSetReasonProbesSucceeded, "Objects are available and pass all probes.")

// Record the timestamp of the first time the revision was observed to be
Expand Down Expand Up @@ -286,9 +286,9 @@ func (c *ClusterObjectSetReconciler) reconcile(ctx context.Context, cos *ocv1.Cl
if len(probeFailureMsgs) > 0 {
markAsUnavailable(cos, ocv1.ClusterObjectSetReasonProbeFailure, strings.Join(probeFailureMsgs, "\n"))
} else {
markAsUnavailable(cos, ocv1.ReasonRollingOut, fmt.Sprintf("Revision %s is rolling out.", revVersion))
markAsUnavailable(cos, ocv1.ReasonRollingOut, fmt.Sprintf("Revision %d is rolling out.", revisionNumber))
}
markAsProgressing(l, cos, ocv1.ReasonRollingOut, fmt.Sprintf("Revision %s is rolling out.", revVersion), isDeadlineExceeded)
markAsProgressing(l, cos, ocv1.ReasonRollingOut, fmt.Sprintf("Revision %d is rolling out.", revisionNumber), isDeadlineExceeded)
if hasDeadline && !isDeadlineExceeded {
return ctrl.Result{RequeueAfter: remaining}, nil
}
Expand Down
16 changes: 8 additions & 8 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 @@ -98,7 +98,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_RevisionReconciliation(t *testing
Type: ocv1.ClusterObjectSetTypeAvailable,
Status: metav1.ConditionTrue,
Reason: ocv1.ClusterObjectSetReasonProbesSucceeded,
Message: "Revision 1.0.0 is rolled out.",
Message: "Revision 1 is rolled out.",
ObservedGeneration: 1,
})
return []client.Object{ext, rev1}
Expand Down Expand Up @@ -136,7 +136,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_RevisionReconciliation(t *testing
require.NotNil(t, cond)
require.Equal(t, metav1.ConditionFalse, cond.Status)
require.Equal(t, ocv1.ReasonRollingOut, cond.Reason)
require.Equal(t, "Revision 1.0.0 is rolling out.", cond.Message)
require.Equal(t, "Revision 1 is rolling out.", cond.Message)
require.Equal(t, int64(1), cond.ObservedGeneration)
},
},
Expand Down Expand Up @@ -360,7 +360,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_RevisionReconciliation(t *testing
require.NotNil(t, cond)
require.Equal(t, metav1.ConditionTrue, cond.Status)
require.Equal(t, ocv1.ReasonRollingOut, cond.Reason)
require.Equal(t, "Revision 1.0.0 is rolling out.", cond.Message)
require.Equal(t, "Revision 1 is rolling out.", cond.Message)
require.Equal(t, int64(1), cond.ObservedGeneration)
},
},
Expand All @@ -378,7 +378,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_RevisionReconciliation(t *testing
Type: ocv1.TypeProgressing,
Status: metav1.ConditionTrue,
Reason: ocv1.ReasonRollingOut,
Message: "Revision 1.0.0 is rolling out.",
Message: "Revision 1 is rolling out.",
ObservedGeneration: 1,
})
return []client.Object{ext, rev1}
Expand All @@ -393,7 +393,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_RevisionReconciliation(t *testing
require.NotNil(t, cond)
require.Equal(t, metav1.ConditionTrue, cond.Status)
require.Equal(t, ocv1.ReasonSucceeded, cond.Reason)
require.Equal(t, "Revision 1.0.0 has rolled out.", cond.Message)
require.Equal(t, "Revision 1 has rolled out.", cond.Message)
require.Equal(t, int64(1), cond.ObservedGeneration)
},
},
Expand Down Expand Up @@ -425,7 +425,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_RevisionReconciliation(t *testing
require.NotNil(t, cond)
require.Equal(t, metav1.ConditionTrue, cond.Status)
require.Equal(t, ocv1.ReasonSucceeded, cond.Reason)
require.Equal(t, "Revision 1.0.0 has rolled out.", cond.Message)
require.Equal(t, "Revision 1 has rolled out.", cond.Message)
require.Equal(t, int64(1), cond.ObservedGeneration)

require.False(t, rev.Status.CompletedAt.IsZero(), "completedAt should be set on successful rollout")
Expand Down Expand Up @@ -1097,7 +1097,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_ProgressDeadline(t *testing.T) {
Type: ocv1.ClusterObjectSetTypeProgressing,
Status: metav1.ConditionFalse,
Reason: ocv1.ReasonProgressDeadlineExceeded,
Message: "Revision has not rolled out for 1 minute(s). Last status: Revision 1.0.0 is rolling out.",
Message: "Revision has not rolled out for 1 minute(s). Last status: Revision 1 is rolling out.",
ObservedGeneration: rev1.Generation,
})
return []client.Object{rev1, ext}
Expand All @@ -1116,7 +1116,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_ProgressDeadline(t *testing.T) {
require.NotNil(t, cnd)
require.Equal(t, metav1.ConditionTrue, cnd.Status)
require.Equal(t, ocv1.ReasonSucceeded, cnd.Reason)
require.Equal(t, "Revision 1.0.0 has rolled out.", cnd.Message)
require.Equal(t, "Revision 1 has rolled out.", cnd.Message)
},
},
{
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/features/install.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ Feature: Install ClusterExtension
Then ClusterObjectSet "${NAME}-1" reports Progressing as False with Reason ProgressDeadlineExceeded
And ClusterExtension reports Progressing as False with Reason ProgressDeadlineExceeded and Message:
"""
Revision has not rolled out for 1 minute(s). Last status: Revision 1.0.2 is rolling out.
Revision has not rolled out for 1 minute(s). Last status: Revision 1 is rolling out.
"""
And ClusterExtension reports Progressing transition between 1 and 2 minutes since its creation

Expand Down Expand Up @@ -407,7 +407,7 @@ Feature: Install ClusterExtension
Then ClusterObjectSet "${NAME}-1" reports Progressing as False with Reason ProgressDeadlineExceeded
And ClusterExtension reports Progressing as False with Reason ProgressDeadlineExceeded and Message:
"""
Revision has not rolled out for 1 minute(s). Last status: Revision 1.0.3 is rolling out.
Revision has not rolled out for 1 minute(s). Last status: Revision 1 is rolling out.
"""
And ClusterExtension reports Progressing transition between 1 and 2 minutes since its creation

Expand Down
Loading