Merge pull request #682 from tmshort/synchronize

OCPBUGS-78211,OCPBUGS-78455: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

.claude/commands/list-e2e-steps.md

@@ -66,7 +66,7 @@ Organize steps into these 10 categories. For each step, document:
 2. **Catalog Management** - ClusterCatalog creation, updates, image tagging, deletion
 3. **ClusterExtension Lifecycle** - Apply, update, remove ClusterExtension resources
 4. **ClusterExtension Status & Conditions** - Condition checks, transition times, reconciliation
-5. **ClusterExtensionRevision** - Revision-specific condition checks, archival, annotations, labels, active revisions
+5. **ClusterObjectSet** - Object set condition checks, archival, annotations, labels, phase objects, ref Secrets
 6. **Generic Resource Operations** - Get, delete, restore, match arbitrary resources
 7. **Test Operator Control** - Marking test-operator deployment ready/not-ready
 8. **Metrics** - Fetching and validating Prometheus metrics

AGENTS.md

@@ -11,7 +11,7 @@ operator-controller is the central component of Operator Lifecycle Manager (OLM)
 install and manage cluster extensions. The project follows a microservices architecture with two main binaries:
 
 **operator-controller** 
- - manages `ClusterExtension` and `ClusterExtensionRevision` CRDs
+ - manages `ClusterExtension` and `ClusterObjectSet` CRDs
  - resolves bundles from configured source
  - unpacks bundles and renders manifests from them
  - applies manifests with phase-based rollouts
@@ -193,7 +193,7 @@ make generate
 
 - **Primary CRDs:**
   - `ClusterExtension` - declares desired extension installations
-  - `ClusterExtensionRevision` - revision management (experimental)
+  - `ClusterObjectSet` - revision management (experimental)
   - `ClusterCatalog` - catalog source definitions
 - **API domain:** `olm.operatorframework.io`
   - This is the API group of our user-facing CRDs
@@ -204,7 +204,7 @@ make generate
 
 Two manifest variants exist:
 - **Standard:** Production-ready features
-- **Experimental:** Features under development/testing (includes `ClusterExtensionRevision` API)
+- **Experimental:** Features under development/testing (includes `ClusterObjectSet` API)
 
 ---
 
@@ -330,7 +330,7 @@ Two manifest variants exist:
 
 **operator-controller:**
 - `ClusterExtension` controller - manages extension installations
-- `ClusterExtensionRevision` controller - manages revision lifecycle
+- `ClusterObjectSet` controller - manages revision lifecycle
 - Resolver - bundle version selection
 - Applier - applies manifests to cluster
 - Content Manager - manages extension content

OWNERS_ALIASES

@@ -15,6 +15,7 @@ aliases:
    - bentito
    - camilamacedo86
    - dtfranz
+   - fgiudici
    - grokspawn
    - joelanford
    - oceanc80

api/v1/clusterextension_types.go

@@ -468,9 +468,9 @@ type BundleMetadata struct {
 	Version string `json:"version"`
 }
 
-// RevisionStatus defines the observed state of a ClusterExtensionRevision.
+// RevisionStatus defines the observed state of a ClusterObjectSet.
 type RevisionStatus struct {
-	// name of the ClusterExtensionRevision resource
+	// name of the ClusterObjectSet resource
 	Name string `json:"name"`
 	// conditions optionally expose Progressing and Available condition of the revision,
 	// in case when it is not yet marked as successfully installed (condition Succeeded is not set to True).
@@ -498,7 +498,7 @@ type ClusterExtensionStatus struct {
 	// When Progressing is True and the Reason is Retrying, the ClusterExtension has encountered an error that could be resolved on subsequent reconciliation attempts.
 	// When Progressing is False and the Reason is Blocked, the ClusterExtension has encountered an error that requires manual intervention for recovery.
 	// <opcon:experimental:description>
-	// When Progressing is True and Reason is RollingOut, the ClusterExtension has one or more ClusterExtensionRevisions in active roll out.
+	// When Progressing is True and Reason is RollingOut, the ClusterExtension has one or more ClusterObjectSets in active roll out.
 	// </opcon:experimental:description>
 	//
 	// When the ClusterExtension is sourced from a catalog, it surfaces deprecation conditions based on catalog metadata.
@@ -518,7 +518,7 @@ type ClusterExtensionStatus struct {
 	// +optional
 	Install *ClusterExtensionInstallStatus `json:"install,omitempty"`
 
-	// activeRevisions holds a list of currently active (non-archived) ClusterExtensionRevisions,
+	// activeRevisions holds a list of currently active (non-archived) ClusterObjectSets,
 	// including both installed and rolling out revisions.
 	// +listType=map
 	// +listMapKey=name