Skip to content

⚠ Remove Progressing condition from ClusterObjectSet #2952

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

⚠ Remove Progressing condition from ClusterObjectSet #2952

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
28 changes: 13 additions & 15 deletions api/v1/clusterobjectset_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ const (
ClusterObjectSetKind = "ClusterObjectSet"

// Condition Types
ClusterObjectSetTypeAvailable = "Available"
ClusterObjectSetTypeProgressing = "Progressing"
ClusterObjectSetTypeAvailable = "Available"

// Condition Reasons
ClusterObjectSetReasonArchived = "Archived"
Expand Down Expand Up @@ -495,19 +494,19 @@ type ClusterObjectSetStatus struct {
// conditions is an optional list of status conditions describing the state of the
// ClusterObjectSet.
//
// The Progressing condition represents whether the revision is actively rolling out:
// - When status is True and reason is RollingOut, the ClusterObjectSet rollout is actively making progress and is in transition.
// - When status is True and reason is Retrying, the ClusterObjectSet has encountered an error that could be resolved on subsequent reconciliation attempts.
// - When status is True and reason is Succeeded, the ClusterObjectSet has reached the desired state.
// - When status is False and reason is Blocked, the ClusterObjectSet has encountered an error that requires manual intervention for recovery.
// - When status is False and reason is Archived, the ClusterObjectSet is archived and not being actively reconciled.
// The Available condition represents the state of the revision.
// 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.
// - 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 available.
// - False with reason Blocked: the revision has encountered an error that requires manual intervention for recovery.
// - False with reason ProgressDeadlineExceeded: the revision did not roll out within spec.progressDeadlineMinutes.
// - False with reason Reconciling: the revision encountered an error that prevented it from observing the probes.
// - False with reason Archived: the revision has been archived and its objects have been torn down.
//
// The Available condition represents whether the revision has been successfully rolled out and is available:
// - When status is True and reason is ProbesSucceeded, the ClusterObjectSet has been successfully rolled out and all objects pass their readiness probes.
// - When status is False and reason is ProbeFailure, one or more objects are failing their readiness probes during rollout.
// - When status is Unknown and reason is Reconciling, the ClusterObjectSet has encountered an error that prevented it from observing the probes.
// - When status is Unknown and reason is Archived, the ClusterObjectSet has been archived and its objects have been torn down.
// - When status is Unknown and reason is Migrated, the ClusterObjectSet was migrated from an existing release and object status probe results have not yet been observed.
// Rollout completion is recorded separately by status.completedAt.
//
// +listType=map
// +listMapKey=type
Expand Down Expand Up @@ -562,7 +561,6 @@ type ObservedPhase struct {
// +kubebuilder:resource:scope=Cluster
// +kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Available",type=string,JSONPath=`.status.conditions[?(@.type=='Available')].status`
// +kubebuilder:printcolumn:name="Progressing",type=string,JSONPath=`.status.conditions[?(@.type=='Progressing')].status`
// +kubebuilder:printcolumn:name=Age,type=date,JSONPath=`.metadata.creationTimestamp`

// ClusterObjectSet represents an immutable snapshot of Kubernetes objects
Expand Down
24 changes: 12 additions & 12 deletions applyconfigurations/api/v1/clusterobjectsetstatus.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions cmd/object-controller/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ func TestStandaloneController(t *testing.T) {
assert.Equal(collect, metav1.ConditionTrue, available.Status)
assert.Equal(collect, ocv1.ClusterObjectSetReasonProbesSucceeded, available.Reason)
}
progressing := meta.FindStatusCondition(cos.Status.Conditions, ocv1.ClusterObjectSetTypeProgressing)
if assert.NotNil(collect, progressing) {
assert.Equal(collect, ocv1.ReasonSucceeded, progressing.Reason)
}
}, time.Minute, 100*time.Millisecond)
cm := &corev1.ConfigMap{}
require.NoError(t, cl.Get(ctx, client.ObjectKey{Name: name, Namespace: ns.Name}, cm))
Expand Down
29 changes: 13 additions & 16 deletions ...base/operator-controller/crd/experimental/olm.operatorframework.io_clusterobjectsets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ spec:
- jsonPath: .status.conditions[?(@.type=='Available')].status
name: Available
type: string
- jsonPath: .status.conditions[?(@.type=='Progressing')].status
name: Progressing
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
Expand Down Expand Up @@ -557,19 +554,19 @@ spec:
conditions is an optional list of status conditions describing the state of the
ClusterObjectSet.

The Progressing condition represents whether the revision is actively rolling out:
- When status is True and reason is RollingOut, the ClusterObjectSet rollout is actively making progress and is in transition.
- When status is True and reason is Retrying, the ClusterObjectSet has encountered an error that could be resolved on subsequent reconciliation attempts.
- When status is True and reason is Succeeded, the ClusterObjectSet has reached the desired state.
- When status is False and reason is Blocked, the ClusterObjectSet has encountered an error that requires manual intervention for recovery.
- When status is False and reason is Archived, the ClusterObjectSet is archived and not being actively reconciled.

The Available condition represents whether the revision has been successfully rolled out and is available:
- When status is True and reason is ProbesSucceeded, the ClusterObjectSet has been successfully rolled out and all objects pass their readiness probes.
- When status is False and reason is ProbeFailure, one or more objects are failing their readiness probes during rollout.
- When status is Unknown and reason is Reconciling, the ClusterObjectSet has encountered an error that prevented it from observing the probes.
- When status is Unknown and reason is Archived, the ClusterObjectSet has been archived and its objects have been torn down.
- When status is Unknown and reason is Migrated, the ClusterObjectSet was migrated from an existing release and object status probe results have not yet been observed.
The Available condition represents the state of the revision.
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.
- 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 available.
- False with reason Blocked: the revision has encountered an error that requires manual intervention for recovery.
- False with reason ProgressDeadlineExceeded: the revision did not roll out within spec.progressDeadlineMinutes.
- False with reason Reconciling: the revision encountered an error that prevented it from observing the probes.
- False with reason Archived: the revision has been archived and its objects have been torn down.

Rollout completion is recorded separately by status.completedAt.
items:
description: Condition contains details for one aspect of the current
state of this API Resource.
Expand Down
Loading
Loading