Skip to content

Bug 2009083: handle branchpoint deprecation and pruning during add #209

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
Closed
wants to merge 3 commits into from
Closed

Bug 2009083: handle branchpoint deprecation and pruning during add #209

wants to merge 3 commits into from

Conversation

ankitathomas
Copy link
Contributor

No description provided.

@ankitathomas
handle deprecating branch points (openshift#767)
3085d76 
* do not add skips/replaces entries for deprecated bundles

Signed-off-by: Ankita Thomas <[email protected]>

* remove overwritten channel head before add in overwrite-latest mode - preserve upgrade graph after add

Signed-off-by: Ankita Thomas <[email protected]>

* handle branchpoint deprecation

Remove deprecated bundles from channels of the deprecated bundles,
truncating only when a bundle is not on any channel. Branchpoints (i.e,
branches that have two or more different replacements on different
channels) are removed from any channel that the deprecated bundle was
on, while everything till the first branch point is truncated

Signed-off-by: Ankita Thomas <[email protected]>

* fix unit tests, add function documentation

Signed-off-by: Ankita Thomas <[email protected]>

* remove deprecated channel heads on package delete, simplify populator signature

Signed-off-by: Ankita Thomas <[email protected]>

* optional interface for RemoveOverwrittenChannelHead

Signed-off-by: Ankita Thomas <[email protected]>

* comment changes

Signed-off-by: Ankita Thomas <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: 38994ece779c79a6b238cff667810892c6df0d4e
@ankitathomas
Check only for new bundles on add (openshift#798)
04d2956 
* clarify pruned bundle message

Signed-off-by: Ankita Thomas <[email protected]>

* check only newly added bundles for pruning

Signed-off-by: Ankita Thomas <[email protected]>

* update tests, remove deprecation check on added bundles

Signed-off-by: Ankita Thomas <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: 2ef669fa19baaeb7dce3252d5d3e29ecaf59f753
@ankitathomas
retain single bundle default channel for overwrite (openshift#812)
d0ab3f7 
* retain single bundle default channel for overwrite

Signed-off-by: Ankita Thomas <[email protected]>

* don't preserve empty channels except default for overwrite

Signed-off-by: Ankita Thomas <[email protected]>

Upstream-repository: operator-registry
Upstream-commit: c426f78b97458fe5f25208e4ecee398bbc7ae065
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 21, 2021

@ankitathomas: This pull request references Bugzilla bug 2009083, which is invalid:

  • expected the bug to target the "4.10.0" release, but it targets "---" 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:

Bug 2009083: handle branchpoint deprecation and pruning during add

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 openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Oct 21, 2021
@ankitathomas
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Oct 21, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 21, 2021

@ankitathomas: This pull request references Bugzilla bug 2009083, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

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

No GitHub users were found matching the public email listed for the QA contact in Bugzilla ([email protected]), skipping review request.

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
Copy link
Contributor

openshift-ci bot commented Oct 21, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas

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 openshift-ci bot requested review from exdx and hasbro17 October 21, 2021 17:44
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 21, 2021
@ankitathomas
Copy link
Contributor Author

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 24, 2021 •
edited
Loading

@ankitathomas: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-olm d0ab3f7 link true /test e2e-aws-olm

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@timflannagan
Copy link
Contributor

FYI #217 also contains all of these commits. We'll need to land that sync PR before we can start creating individual BZs anyways so I'm going to throw a hold on this in the meantime.

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 30, 2021
@timflannagan
Copy link
Contributor

closing as #218 included the same commit(s) as this PR

/close

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 2, 2021

@ankitathomas: PR needs rebase.

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 openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 2, 2021
@openshift-ci openshift-ci bot closed this Dec 2, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 2, 2021

@timflannagan: Closed this PR.

In response to this:

closing as #218 included the same commit(s) as this PR

/close

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
Copy link
Contributor

openshift-ci bot commented Dec 2, 2021

@ankitathomas: This pull request references Bugzilla bug 2009083. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state.

In response to this:

Bug 2009083: handle branchpoint deprecation and pruning during add

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.

awgreene pushed a commit to awgreene/operator-framework-olm that referenced this pull request Feb 2, 2022
@fgiloux @awgreene
Added field for optional manifests (openshift#209)
a40db71 
Signed-off-by: Frederic Giloux <[email protected]>

Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
awgreene pushed a commit to awgreene/operator-framework-olm that referenced this pull request Feb 22, 2022
@fgiloux @awgreene
Added field for optional manifests (openshift#209)
c7b2ebf 
Signed-off-by: Frederic Giloux <[email protected]>

Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 1, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
d47e7dd 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 2, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
409304d 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 2, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
5973b61 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 2, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
7a7d511 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
37a77d3 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
da70b24 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
6e4eea6 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
5f351db 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
e263a48 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 7, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
c22164f 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 7, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
f0f8b79 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 8, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
b2e3581 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 9, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
a854dfc 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 10, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
4e6e053 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 10, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
30009e1 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 12, 2022
@fgiloux @perdasilva
Added field for optional manifests (openshift#209)
4326a9a 
Signed-off-by: Frederic Giloux <[email protected]>
Upstream-repository: api
Upstream-commit: 6b187a1d09082142fa12758e1748a132bfe2d79c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@exdx exdx Awaiting requested review from exdx

@hasbro17 hasbro17 Awaiting requested review from hasbro17

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ankitathomas @timflannagan