✨ rename ClusterObjectSet Ready reason to AllObjectsReady; decouple ClusterExtension Available

Rename the ClusterObjectSet Ready condition's success reason from
ProbesSucceeded to AllObjectsReady, with an updated message ("All objects
are at the desired state"). The reason now describes the observed outcome
rather than the probing mechanism.

Decouple the ClusterExtension Available condition from the revision-level
Ready condition: availableFromReady() re-emits the ready (True) state with
a ClusterExtension-owned reason (ReasonProbesSucceeded) and a stable
message, so rewording the ClusterObjectSet Ready condition no longer
alters the ClusterExtension API surface.

Update CRD docs, apply configurations, manifests, and tests accordingly.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: Per G. da Silva

api/v1/clusterobjectset_types.go

@@ -32,8 +32,8 @@ const (
 	ClusterObjectSetReasonArchived        = "Archived"
 	ClusterObjectSetReasonBlocked         = "Blocked"
 	ClusterObjectSetReasonProbeFailure    = "ProbeFailure"
-	ClusterObjectSetReasonProbesSucceeded = "ProbesSucceeded"
 	ClusterObjectSetReasonRetryableError  = "RetryableError"
+	ClusterObjectSetReasonAllObjectsReady = "AllObjectsReady"
 )
 
 // ClusterObjectSetSpec defines the desired state of ClusterObjectSet.
@@ -497,7 +497,7 @@ type ClusterObjectSetStatus struct {
 	// True means all objects are at the desired state; False means one or more
 	// objects are not at the desired state; Unknown is the initial state, before
 	// the first reconciliation has evaluated the revision.
-	//   - True with reason ProbesSucceeded: the revision has rolled out and all objects pass their readiness probes.
+	//   - True with reason AllObjectsReady: the revision has rolled out and all objects are at the desired state.
 	//   - False with reason ProbeFailure: one or more objects are failing their readiness probes during rollout.
 	//   - False with reason RollingOut: the revision is actively rolling out and has not yet become ready.
 	//   - False with reason Blocked: the revision has encountered an error that requires manual intervention for recovery.

api/v1/common_types.go

@@ -27,6 +27,9 @@ const (
 	// Installed reasons
 	ReasonAbsent = "Absent"
 
+	// Available reasons
+	ReasonProbesSucceeded = "ProbesSucceeded"
+
 	// Progressing reasons
 	ReasonRollingOut           = "RollingOut"
 	ReasonRetrying             = "Retrying"

applyconfigurations/api/v1/clusterobjectsetstatus.go

@@ -127,10 +127,10 @@ func TestStandaloneController(t *testing.T) {
 					return
 				}
 				assert.False(collect, cos.Status.CompletedAt.IsZero(), "completedAt should be set after rollout; conditions: %v", cos.Status.Conditions)
-				available := meta.FindStatusCondition(cos.Status.Conditions, ocv1.ClusterObjectSetTypeReady)
-				if assert.NotNil(collect, available) {
-					assert.Equal(collect, metav1.ConditionTrue, available.Status)
-					assert.Equal(collect, ocv1.ClusterObjectSetReasonProbesSucceeded, available.Reason)
+				ready := meta.FindStatusCondition(cos.Status.Conditions, ocv1.ClusterObjectSetTypeReady)
+				if assert.NotNil(collect, ready) {
+					assert.Equal(collect, metav1.ConditionTrue, ready.Status)
+					assert.Equal(collect, ocv1.ClusterObjectSetReasonAllObjectsReady, ready.Reason)
 				}
 			}, time.Minute, 100*time.Millisecond)
 			cm := &corev1.ConfigMap{}

cmd/object-controller/main_test.go

@@ -169,11 +169,11 @@ Indicates whether the revision is actively rolling out.
 
 ### Ready
 
-Indicates whether all objects have been successfully rolled out and pass readiness probes.
+Indicates whether all objects in the revision have been successfully rolled out and reached their desired state.
 
 | Status | Reason | Meaning |
 | --- | --- | --- |
-| True | `ProbesSucceeded` | All objects pass readiness probes |
+| True | `AllObjectsReady` | All objects are at the desired state |
 | False | `ProbeFailure` | One or more probes failing |
 | Unknown | `RetryableError` | Error prevented probe observation |
 | Unknown | `Archived` | Objects torn down after archival |

docs/draft/concepts/clusterobjectsets.md

@@ -558,7 +558,7 @@ spec:
                   True means all objects are at the desired state; False means one or more
                   objects are not at the desired state; Unknown is the initial state, before
                   the first reconciliation has evaluated the revision.
-                    - True with reason ProbesSucceeded: the revision has rolled out and all objects pass their readiness probes.
+                    - True with reason AllObjectsReady: the revision has rolled out and all objects are at the desired state.
                     - False with reason ProbeFailure: one or more objects are failing their readiness probes during rollout.
                     - False with reason RollingOut: the revision is actively rolling out and has not yet become ready.
                     - False with reason Blocked: the revision has encountered an error that requires manual intervention for recovery.

helm/olmv1/base/object-controller/crd/experimental/olm.operatorframework.io_clusterobjectsets.yaml

@@ -245,7 +245,7 @@ func (c *ClusterObjectSetReconciler) reconcile(ctx context.Context, cos *ocv1.Cl
 			}
 		}
 
-		markAsReady(cos, ocv1.ClusterObjectSetReasonProbesSucceeded, "Objects are available and pass all probes.")
+		markAsReady(cos, ocv1.ClusterObjectSetReasonAllObjectsReady, "All objects are at the desired state")
 
 		// Record the timestamp of the first time the revision was observed to be
 		// ready. This is set once and never changes for subsequent reconciliations.

internal/object-controller/controllers/clusterobjectset_controller.go

@@ -102,7 +102,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_RevisionReconciliation(t *testing
 				meta.SetStatusCondition(&rev1.Status.Conditions, metav1.Condition{
 					Type:               ocv1.ClusterObjectSetTypeReady,
 					Status:             metav1.ConditionTrue,
-					Reason:             ocv1.ClusterObjectSetReasonProbesSucceeded,
+					Reason:             ocv1.ClusterObjectSetReasonAllObjectsReady,
 					Message:            "Revision 1 is rolled out.",
 					ObservedGeneration: 1,
 				})
@@ -371,7 +371,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_RevisionReconciliation(t *testing
 			},
 		},
 		{
-			name: "set Ready:True:ProbesSucceeded condition and completedAt on successful revision rollout",
+			name: "set Ready:True:AllObjectsReady condition and completedAt on successful revision rollout",
 			revisionResult: newMockRevisionResult(mockCtrl, revisionResultConfig{
 				isComplete: true,
 			}),
@@ -390,8 +390,8 @@ func Test_ClusterObjectSetReconciler_Reconcile_RevisionReconciliation(t *testing
 				cond := meta.FindStatusCondition(rev.Status.Conditions, ocv1.ClusterObjectSetTypeReady)
 				require.NotNil(t, cond)
 				require.Equal(t, metav1.ConditionTrue, cond.Status)
-				require.Equal(t, ocv1.ClusterObjectSetReasonProbesSucceeded, cond.Reason)
-				require.Equal(t, "Objects are available and pass all probes.", cond.Message)
+				require.Equal(t, ocv1.ClusterObjectSetReasonAllObjectsReady, cond.Reason)
+				require.Equal(t, "All objects are at the desired state", cond.Message)
 				require.Equal(t, int64(1), cond.ObservedGeneration)
 
 				require.False(t, rev.Status.CompletedAt.IsZero(), "completedAt should be set on successful rollout")
@@ -1102,7 +1102,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_ProgressDeadline(t *testing.T) {
 			},
 		},
 		{
-			name: "recovery from ProgressDeadlineExceeded to ProbesSucceeded when revision completes",
+			name: "recovery from ProgressDeadlineExceeded to AllObjectsReady when revision completes",
 			existingObjs: func() []client.Object {
 				ext := newTestClusterExtension()
 				rev1 := newTestClusterObjectSet(t, clusterObjectSetName, ext, testScheme)
@@ -1130,8 +1130,8 @@ func Test_ClusterObjectSetReconciler_Reconcile_ProgressDeadline(t *testing.T) {
 				cnd := meta.FindStatusCondition(rev.Status.Conditions, ocv1.ClusterObjectSetTypeReady)
 				require.NotNil(t, cnd)
 				require.Equal(t, metav1.ConditionTrue, cnd.Status)
-				require.Equal(t, ocv1.ClusterObjectSetReasonProbesSucceeded, cnd.Reason)
-				require.Equal(t, "Objects are available and pass all probes.", cnd.Message)
+				require.Equal(t, ocv1.ClusterObjectSetReasonAllObjectsReady, cnd.Reason)
+				require.Equal(t, "All objects are at the desired state", cnd.Message)
 			},
 		},
 		{
@@ -1144,7 +1144,7 @@ func Test_ClusterObjectSetReconciler_Reconcile_ProgressDeadline(t *testing.T) {
 				meta.SetStatusCondition(&rev1.Status.Conditions, metav1.Condition{
 					Type:               ocv1.ClusterObjectSetTypeReady,
 					Status:             metav1.ConditionTrue,
-					Reason:             ocv1.ClusterObjectSetReasonProbesSucceeded,
+					Reason:             ocv1.ClusterObjectSetReasonAllObjectsReady,
 					ObservedGeneration: rev1.Generation,
 				})
 				rev1.Status.CompletedAt = metav1.Now()

internal/object-controller/controllers/clusterobjectset_controller_test.go

@@ -46,4 +46,5 @@ var ConditionReasons = []string{
 	ocv1.ReasonAbsent,
 	ocv1.ReasonRollingOut,
 	ocv1.ReasonProgressDeadlineExceeded,
+	ocv1.ReasonProbesSucceeded,
 }

internal/operator-controller/conditionsets/conditionsets.go

@@ -69,6 +69,25 @@ func setInstalledStatusFromRevisionStates(ext *ocv1.ClusterExtension, revisionSt
 	setInstalledStatusConditionSuccess(ext, fmt.Sprintf("Installed bundle %s successfully", revisionStates.Installed.Image))
 }
 
+// availableTrueMessage is the message surfaced on the ClusterExtension Available condition when the
+// active revision is Ready. It is intentionally decoupled from the ClusterObjectSet Ready condition's
+// own message.
+const availableTrueMessage = "Objects are available and pass all probes."
+
+// availableFromReady maps a ClusterObjectSet Ready condition onto a ClusterExtension Available condition.
+// Non-ready states are surfaced as-is (only the Type is rewritten to Available). The ready (True) state is
+// re-emitted with a ClusterExtension-owned reason and message.
+func availableFromReady(ready metav1.Condition, generation int64) metav1.Condition {
+	a := ready
+	a.Type = ocv1.TypeAvailable
+	a.ObservedGeneration = generation
+	if a.Status == metav1.ConditionTrue {
+		a.Reason = ocv1.ReasonProbesSucceeded
+		a.Message = availableTrueMessage
+	}
+	return a
+}
+
 // setActiveRevisionsFromRevisionStates derives the active revisions for the ClusterExtension status
 func setActiveRevisionsFromRevisionStates(ext *ocv1.ClusterExtension, revisionStates *RevisionStates) {
 	ext.Status.ActiveRevisions = make([]ocv1.RevisionStatus, 0, 1+len(revisionStates.RollingOut))
@@ -79,10 +98,7 @@ func setActiveRevisionsFromRevisionStates(ext *ocv1.ClusterExtension, revisionSt
 		rs := ocv1.RevisionStatus{Name: r.RevisionName}
 		ready := apimeta.FindStatusCondition(r.Conditions, ocv1.ClusterObjectSetTypeReady)
 		if ready != nil {
-			a := *ready
-			a.Type = ocv1.TypeAvailable
-			a.ObservedGeneration = ext.GetGeneration()
-			apimeta.SetStatusCondition(&rs.Conditions, a)
+			apimeta.SetStatusCondition(&rs.Conditions, availableFromReady(*ready, ext.GetGeneration()))
 		}
 		ext.Status.ActiveRevisions = append(ext.Status.ActiveRevisions, rs)
 	}
@@ -93,10 +109,7 @@ func setAvailableFromRevisionStates(ext *ocv1.ClusterExtension, revisionStates *
 	if i := revisionStates.Installed; i != nil {
 		ready := apimeta.FindStatusCondition(i.Conditions, ocv1.ClusterObjectSetTypeReady)
 		if ready != nil {
-			a := *ready
-			a.Type = ocv1.TypeAvailable
-			a.ObservedGeneration = ext.GetGeneration()
-			apimeta.SetStatusCondition(&ext.Status.Conditions, a)
+			apimeta.SetStatusCondition(&ext.Status.Conditions, availableFromReady(*ready, ext.GetGeneration()))
 		}
 	}
 }
@@ -261,7 +274,7 @@ func progressingFromReady(ready *metav1.Condition, completed bool) metav1.Condit
 	case ocv1.ClusterObjectSetReasonRetryableError:
 		cond.Reason = ocv1.ReasonRetrying
 	default:
-		// ProbeFailure, RollingOut, or ProbesSucceeded-but-not-yet-complete.
+		// ProbeFailure, RollingOut, or AllObjectsReady-but-not-yet-complete.
 		cond.Reason = ocv1.ReasonRollingOut
 	}
 	return cond