Repository navigation
Conversation
Map ClusterObjectDeployment OwnerConflict to Progressing=True/Retrying and Installed=False/Failed for first installs. Preserve the deployment's diagnostic message and the previously installed bundle during upgrades. Cover status recovery through rollout completion and document the mapping. Refs: operator-framework#3074 Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com> rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED
✅ Deploy Preview for olmv1 ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
No actionable comments were generated in the recent review.
 |
| Layer / File(s) | Summary |
|---|---|
Map and verify owner-conflict status internal/operator-controller/controllers/clusterobjectdeployment_status.go, internal/operator-controller/controllers/clusterobjectdeployment_status_test.go, docs/draft/concepts/clusterobjectsets.md |
The controller maps OwnerConflict to Retrying and maps it to Failed when no bundle is installed. Tests cover first install, upgrade, and rollout progress. The documentation describes the status conditions and reconciliation behavior. |
Estimated code review effort: 2 (Simple) | ~10 minutes
Change: Bug fix
Suggested reviewers: rashmigottipati, perdasilva
Merge Risk: 
9d3b4
-
Ownership conflicts are reported as intended, with no actionable merge-blocking risk identified.
Pre-merge checks: 
-
Check name Status Explanation Resolution Docstring Coverage Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documenta… Write docstrings for the functions missing them to satisfy the coverage threshold. -
Check name Status Explanation Title check The title clearly identifies the bug fix and matches the main change: surfacing deployment owner conflicts on ClusterExtensions. Description check The description explains the motivation, expected status changes, upgrade behavior, tests, validation results, related issues, and the fact that full E2E suites were not run. It includes the required … Linked Issues check Check skipped because no linked issues were found for this pull request. Out of Scope Changes check Check skipped because no linked issues were found for this pull request. Full details: Description check
-
Explanation
The description explains the motivation, expected status changes, upgrade behavior, tests, validation results, related issues, and the fact that full E2E suites were not run. It includes the required template sections.
-
Full details: Docstring Coverage
-
Explanation
Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 4 functions across 2 files. (1 skipped: 1 unsupported.)
Resolution
Write docstrings for the functions missing them to satisfy the coverage threshold.
-
Finishing Touches
-
Generate unit tests (beta)
-
- Create a new PR
-
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Description
An ownership conflict on the highest active ClusterObjectSet blocks revision creation, but the owning ClusterExtension reports
Progressing=True/RollingOutandInstalled=False/Absenton a first install. Surface the conflict asProgressing=True/RetryingandInstalled=False/Failed, preserving the diagnostic message and any previously installed bundle during upgrades. Add regression coverage for recovery through rollout completion and document the mapping.Follow-up to the status-mapping review comment on #3074.
Related to OPRUN-4783.
Validation
make test-unitpassed with race detection usingumask 022.make lintandmake verifypassed.RollingOutreason before the fix and passed afterward.Full cluster E2E suites were not run.
Reviewer Checklist
Summary by CodeRabbit