Skip to content

Conversation

@iamniting
Copy link
Member

@iamniting iamniting commented Jan 21, 2026

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]

More info regarding this change can be found in JIRA where this change was suggested by Kursad Yildirim: https://issues.redhat.com/browse/DFBUGS-5327

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2026
@iamniting
Copy link
Member Author

/cherry-pick release-4.21
/cherry-pick release-4.20

@openshift-cherrypick-robot

@iamniting: once the present PR merges, I will cherry-pick it on top of release-4.20, release-4.21 in new PRs and assign them to you.

Details

In response to this:

/cherry-pick release-4.21
/cherry-pick release-4.20

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.

Copy link
Member

@Nikhil-Ladha Nikhil-Ladha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

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

openshift-ci bot commented Jan 21, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, Nikhil-Ladha

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-merge-bot openshift-merge-bot bot merged commit 7ec6a69 into red-hat-storage:main Jan 21, 2026
17 checks passed
@openshift-cherrypick-robot

@iamniting: new pull request created: #725

Details

In response to this:

/cherry-pick release-4.21
/cherry-pick release-4.20

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-cherrypick-robot

@iamniting: new pull request created: #726

Details

In response to this:

/cherry-pick release-4.21
/cherry-pick release-4.20

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.

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants