You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
🐛 OPRUN-4783: Surface deployment owner conflicts on ClusterExtensions - #3094
An ownership conflict on the highest active ClusterObjectSet blocks revision creation, but the owning ClusterExtension reports Progressing=True/RollingOut and Installed=False/Absent on a first install. Surface the conflict as Progressing=True/Retrying and Installed=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.
make test-unit passed with race detection using umask 022.
make lint and make verify passed.
The focused regression tests reproduced the incorrect RollingOut reason before the fix and passed afterward.
Full cluster E2E suites were not run.
Reviewer Checklist
API Go Documentation
Tests: Unit Tests (and E2E Tests, if appropriate)
Comprehensive Commit Messages
Links to related GitHub Issue(s)
Summary by CodeRabbit
Bug Fixes
Owner conflicts now show as retrying, with conflict details preserved. On a first install, the installation is marked failed; during upgrades, the previously installed bundle remains installed and available until the new rollout completes. Reconciliation resumes automatically once the conflict is cleared, and the new bundle can then roll out successfully.
Documentation
Clarified how owner conflicts affect installation status and upgrade behavior.
No actionable comments were generated in the recent review.
Walkthrough
The controller now reports owner conflicts as retryable. First installs report Installed=False with reason Failed. Upgrades preserve the previously installed bundle and installed condition while updating the observed generation. Tests and documentation describe these behaviors and recovery after the conflict clears.
Changes: OwnerConflict handling
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 to Failed when no bundle is installed. During an incomplete upgrade, it updates the installed condition’s observed generation while preserving its other details. Unit tests cover status mapping and first-install and upgrade behavior. The documentation describes the reported conditions and reconciliation behavior.
Verify install and upgrade recovery test/e2e/features/install.feature, test/e2e/features/update.feature
End-to-end scenarios verify owner-conflict status during first install and upgrade. After the conflicting object set is archived, the scenarios verify rollout and availability of the expected bundle.
Owner conflicts are reported as retryable while upgrades retain the installed bundle. No merge-blocking risk was identified.
Pre-merge checks: 4 · 1
Failed checks: 1 warning
Check name
Status
Explanation
Resolution
Docstring Coverage
Docstring coverage is 60.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.
Passed checks: 4 passed
Check name
Status
Explanation
Title check
The title names the main change: owner conflicts on a deployment are now surfaced as ClusterExtension status. The changeset maps OwnerConflict to Progressing=True/Retrying and Installed=False/Failed, …
Description check
The description covers the problem, the status mapping, the upgrade behavior, the regression tests, and the validation performed. It also links the related issue and the review comment. It does not co…
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: Title check
Explanation
The title names the main change: owner conflicts on a deployment are now surfaced as ClusterExtension status. The changeset maps OwnerConflict to Progressing=True/Retrying and Installed=False/Failed, which matches the title's intent. The 🐛 prefix matches the bug-fix convention in the template. The title is 70 characters, which is within a typical limit.
Full details: Description check
Explanation
The description covers the problem, the status mapping, the upgrade behavior, the regression tests, and the validation performed. It also links the related issue and the review comment. It does not cover the template's API Go Documentation item or the commit message and issue link checklist items, which are unchecked. The template is mostly complete, so the check passes. The description does not state whether the API Go Documentation item applies, and the template's reviewer checklist items remain unchecked.
Full details: Docstring Coverage
Explanation
Docstring coverage is 60.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 5 functions across 2 files. (3 skipped: 3 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
Tip
🎯 Customize your risk assessments
Guide how CodeRabbit assesses merge risk and security architecture risk. Highlight sensitive changes and explain your security boundaries using Merge Risk Instructions and Security Risk Instructions in your review settings. Security architecture risk assessments require the Advanced plan or above.
✅ Automatic approvals, with your rules
Let CodeRabbit approve pull requests once required threads are resolved, pre-merge checks pass, and your risk limits are met. Enable Automatic approvals in review settings, with overrides for teams or file paths.
CodeRabbit Verify
Run CodeRabbit Verify to test the changes in this pull request.
Recent review info
Run configuration
Source mode: Auto
Repository: Unavailable
Branch: Unavailable
File: No configuration file from this repository applied
Commit: Unavailable
Layers: defaults
Review profile: CHILL
Plan: Enterprise
Run ID: 13fa9bb3-e4c4-4db1-beaf-a11645ca5029
Commits
Reviewing files that changed from the base of the PR and between 9d3b4d8 and c525760.
Included review availability: This review used your included allowance. Your plan provides up to 12 included reviews per hour; 11 remain after this review.
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.
Refresh the installed condition's observedGeneration when acknowledging
a changed spec without promoting the new bundle.
Cover first installs, upgrades, and recovery with unit and E2E regression
tests, and document the status 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
Added two BoxcutterRuntime E2Es covering first-install and upgrade owner conflicts, including the diagnostic message and recovery after archiving the foreign revision. The upgrade test checks that the previous bundle remains installed and available; it also exposed a stale Installed.observedGeneration, which is now refreshed without changing the installed bundle or other condition details.
Both E2Es pass locally (36 steps), along with make test-unit, make lint, and make verify.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
approvedIndicates a PR has been approved by an approver from all required OWNERS files.lgtmIndicates that a PR is ready to be merged.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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