Skip to content

[release-4.6] Bug 1899747: Recreate pending installplan if deleted before approval #1874

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
merged 2 commits into from
Dec 4, 2020
Merged

[release-4.6] Bug 1899747: Recreate pending installplan if deleted before approval #1874

merged 2 commits into from
Dec 4, 2020

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1843

/assign dinhxuanvu

@dinhxuanvu
fix(ip): Recreate pending installplan if deleted before approval
af8de51 
At the moment, OLM will not recreate the pending-approval
installplan. The subscription will be stuck in UpgradePending forever
as a result. This PR will enable installplan recreation if it is deleted
before approval.

Signed-off-by: Vu Dinh <[email protected]>
@dinhxuanvu
Using subscription reconciliation to clean installplan status instead
f8b564e 
Signed-off-by: Vu Dinh <[email protected]>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Nov 19, 2020
Merged
5 tasks
@openshift-ci-robot
Copy link
Collaborator

@openshift-cherrypick-robot: Bugzilla bug 1841175 has been cloned as Bugzilla bug 1899747. Retitling PR to link against new bug.
/retitle [release-4.6] Bug 1899747: Recreate pending installplan if deleted before approval

In response to this:

[release-4.6] Bug 1841175: Recreate pending installplan if deleted before approval

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/test-infra repository.

@openshift-ci-robot openshift-ci-robot changed the title [release-4.6] Bug 1841175: Recreate pending installplan if deleted before approval [release-4.6] Bug 1899747: Recreate pending installplan if deleted before approval Nov 19, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Nov 19, 2020
@openshift-ci-robot
Copy link
Collaborator

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1899747, which is invalid:

  • expected dependent Bugzilla bug 1841175 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is MODIFIED instead

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

In response to this:

[release-4.6] Bug 1899747: Recreate pending installplan if deleted before approval

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/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Nov 19, 2020
@dinhxuanvu
Copy link
Member

/retest

1 similar comment
@dinhxuanvu
Copy link
Member

/retest

@dinhxuanvu
Copy link
Member

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Nov 23, 2020
@openshift-ci-robot
Copy link
Collaborator

@dinhxuanvu: This pull request references Bugzilla bug 1899747, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.z) matches configured target release for branch (4.6.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1841175 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1841175 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
  • bug has dependents

In response to this:

/bugzilla 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 kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Nov 23, 2020
@dinhxuanvu
Copy link
Member

/retest

2 similar comments
@dinhxuanvu
Copy link
Member

/retest

@dinhxuanvu
Copy link
Member

/retest

dinhxuanvu
dinhxuanvu approved these changes Nov 24, 2020
View reviewed changes
Copy link
Member

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

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

/approve

@hasbro17
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 24, 2020
@hasbro17
Copy link
Contributor

/retest

@kevinrizza
Copy link
Member

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 24, 2020
@dinhxuanvu
Copy link
Member

/cherry-pick release-4.5

@openshift-cherrypick-robot
Copy link
Author

@dinhxuanvu: once the present PR merges, I will cherry-pick it on top of release-4.5 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.5

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/test-infra repository.

@sdodson sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 2, 2020
@dinhxuanvu
Copy link
Member

/retest

@sdodson
Copy link

sdodson commented Dec 3, 2020

Putting a temporary hold on things to prioritize items that fix test flakes while we're hitting AWS quota limits. I'll clear this later today.
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 3, 2020
@sdodson
Copy link

sdodson commented Dec 3, 2020

/hold cancel
/retest

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 3, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

3 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 74afb99 into operator-framework:release-4.6 Dec 4, 2020
@openshift-ci-robot
Copy link
Collaborator

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 1899747 has been moved to the MODIFIED state.

In response to this:

[release-4.6] Bug 1899747: Recreate pending installplan if deleted before approval

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/test-infra repository.

@openshift-cherrypick-robot
Copy link
Author

@dinhxuanvu: #1874 failed to apply on top of branch "release-4.5":

Applying: fix(ip): Recreate pending installplan if deleted before approval
Using index info to reconstruct a base tree...
M	pkg/controller/operators/catalog/operator.go
M	test/e2e/subscription_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/subscription_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/subscription_e2e_test.go
Auto-merging pkg/controller/operators/catalog/operator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix(ip): Recreate pending installplan if deleted before approval
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.5

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/test-infra repository.

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

@dinhxuanvu dinhxuanvu dinhxuanvu approved these changes

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

Assignees

@hasbro17 hasbro17

@dinhxuanvu dinhxuanvu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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.
8 participants
@openshift-cherrypick-robot @openshift-ci-robot @dinhxuanvu @hasbro17 @kevinrizza @sdodson @openshift-bot @openshift-merge-robot