diff --git a/internal/object-controller/controllers/clusterobjectset_controller.go b/internal/object-controller/controllers/clusterobjectset_controller.go index 32cc90cdb6..9e6d4b15a8 100644 --- a/internal/object-controller/controllers/clusterobjectset_controller.go +++ b/internal/object-controller/controllers/clusterobjectset_controller.go @@ -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 @@ -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 @@ -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 } diff --git a/internal/object-controller/controllers/clusterobjectset_controller_test.go b/internal/object-controller/controllers/clusterobjectset_controller_test.go index f5ebd7c441..808762c62f 100644 --- a/internal/object-controller/controllers/clusterobjectset_controller_test.go +++ b/internal/object-controller/controllers/clusterobjectset_controller_test.go @@ -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} @@ -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) }, }, @@ -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) }, }, @@ -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} @@ -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) }, }, @@ -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") @@ -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} @@ -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) }, }, { diff --git a/test/e2e/features/install.feature b/test/e2e/features/install.feature index 570b231aed..2611edeec0 100644 --- a/test/e2e/features/install.feature +++ b/test/e2e/features/install.feature @@ -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 @@ -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