Skip to content

DFBUGS-5327:[release-4.21] controllers: approve InstallPlans only in RequiresApproval phase #726

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

Jump to bottom
Merged
openshift-merge-bot merged 1 commit into from
Jan 22, 2026
Merged

DFBUGS-5327:[release-4.21] controllers: approve InstallPlans only in RequiresApproval phase #726

openshift-merge-bot merged 1 commit into from
Jan 22, 2026

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jan 21, 2026

This is an automated cherry-pick of #724

/assign iamniting

@iamniting
controllers: approve InstallPlans only in RequiresApproval phase
7815da3 
Approve InstallPlans only after OLM reaches RequiresApproval

OLM creates an initial InstallPlan that was approved immediately by
the ODF operator while OLM was still processing it. OLM then detected
the change as a modification conflict, treated the InstallPlan as
invalid, and created a second duplicate InstallPlan. Subscriptions
were updated to point to the new InstallPlan, which remained
unapproved and caused upgrades to get stuck in UpgradePending.

To prevent this, InstallPlans are now approved only after they reach
the RequiresApproval phase, indicating that OLM has finished
processing and is explicitly waiting for an external approver. This
avoids the conflict, prevents duplicate InstallPlans, and ensures
upgrades complete successfully.

Signed-off-by: Nitin Goyal <[email protected]>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 21, 2026
Merged
@iamniting iamniting changed the title [release-4.21] controllers: approve InstallPlans only in RequiresApproval phase DFBUGS-5327:[release-4.21] controllers: approve InstallPlans only in RequiresApproval phase Jan 22, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid jira ticket of any type jira/invalid-bug Indicates that the referenced jira bug is invalid for the branch this PR is targeting labels Jan 22, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 22, 2026 •
edited by openshift-ci bot
Loading

@openshift-cherrypick-robot: This pull request references [Jira Issue DFBUGS-5327](https://issues.redhat.com//browse/DFBUGS-5327), which is invalid:

  • expected the bug to target the "odf-4.21" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

This is an automated cherry-pick of #724

/assign iamniting

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@iamniting
Copy link
Member

iamniting commented Jan 22, 2026

/test odf-operator-e2e-aws

@iamniting
Copy link
Member

iamniting commented Jan 22, 2026

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that the referenced jira bug is valid for the branch this PR is targeting and removed jira/invalid-bug Indicates that the referenced jira bug is invalid for the branch this PR is targeting labels Jan 22, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 22, 2026 •
edited by openshift-ci bot
Loading

@iamniting: This pull request references [Jira Issue DFBUGS-5327](https://issues.redhat.com//browse/DFBUGS-5327), which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (odf-4.21) matches configured target version for branch (odf-4.21)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @bkopilov

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 22, 2026 •
edited
Loading

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: bkopilov.

Note that only red-hat-storage members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

@iamniting: This pull request references [Jira Issue DFBUGS-5327](https://issues.redhat.com//browse/DFBUGS-5327), which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (odf-4.21) matches configured target version for branch (odf-4.21)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @bkopilov

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 22, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 22, 2026
@openshift-merge-bot openshift-merge-bot bot merged commit a00c0f5 into red-hat-storage:release-4.21 Jan 22, 2026
16 checks passed
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 22, 2026 •
edited by openshift-ci bot
Loading

@openshift-cherrypick-robot: [Jira Issue DFBUGS-5327](https://issues.redhat.com//browse/DFBUGS-5327): All pull requests linked via external trackers have merged:

[Jira Issue DFBUGS-5327](https://issues.redhat.com//browse/DFBUGS-5327) has been moved to the MODIFIED state.

Details

In response to this:

This is an automated cherry-pick of #724

/assign iamniting

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iamniting iamniting iamniting approved these changes

Assignees

@iamniting iamniting

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that the referenced jira bug is valid for the branch this PR is targeting jira/valid-reference Indicates that this PR references a valid jira ticket of any type lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@openshift-cherrypick-robot @openshift-ci-robot @iamniting