OCPBUGS-41540: [4.16] add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384) by grokspawn · Pull Request #859 · openshift/operator-framework-olm

grokspawn · 2024-09-09T19:37:53Z

Allow disabling of migrations for bundles and sqlite DBs
intro new migrations package
schema migration optional; default to olm.bundle.object
review resolutions
use a type to protect migration interactions
review revisions

Upstream-repository: operator-registry
Upstream-commit: c80e8751e716c069017b55279a0f29d0254d426a

some notes about this backport

changes were intertwined with basic template schema definition changes in 4.17 which required some manual intervention in the merge to avoid propagating
in 4.17+ the composite template was removed. In 4.16 is has not been, so to match expectations of any users, this commit enables all migrations for basic & semver template builders of composite template

openshift-ci · 2024-09-09T19:39:33Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: grokspawn

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:

~~DOWNSTREAM_OWNERS~~ [grokspawn]

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

grokspawn · 2024-09-09T19:46:38Z

/jira cherrypick OCPBUGS-39458

openshift-ci-robot · 2024-09-09T19:46:50Z

@grokspawn: Jira Issue OCPBUGS-39458 has been cloned as Jira Issue OCPBUGS-41540. Will retitle bug to link to clone.
/retitle OCPBUGS-41540: ✨ add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384)

Details

In response to this:

/jira cherrypick OCPBUGS-39458

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-robot · 2024-09-09T19:47:23Z

@grokspawn: This pull request references Jira Issue OCPBUGS-41540, which is invalid:

expected dependent Jira Issue OCPBUGS-39458 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead
expected dependent Jira Issue OCPBUGS-39458 to target a version in 4.17.0, but it targets "4.17.z" instead

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.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Allow disabling of migrations for bundles and sqlite DBs

intro new migrations package

schema migration optional; default to olm.bundle.object

review resolutions

use a type to protect migration interactions

review revisions

Upstream-repository: operator-registry
Upstream-commit: c80e8751e716c069017b55279a0f29d0254d426a

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.

…of olm.csv.metadata (#1384) * Allow disabling of migrations for bundles and sqlite DBs Signed-off-by: Joe Lanford <joe.lanford@gmail.com> * intro new migrations package Signed-off-by: Joe Lanford <joe.lanford@gmail.com> * schema migration optional; default to olm.bundle.object Signed-off-by: Jordan Keister <jordan@nimblewidget.com> * review resolutions Signed-off-by: Jordan Keister <jordan@nimblewidget.com> * use a type to protect migration interactions Signed-off-by: Jordan Keister <jordan@nimblewidget.com> * review revisions Signed-off-by: Jordan Keister <jordan@nimblewidget.com> --------- Signed-off-by: Joe Lanford <joe.lanford@gmail.com> Signed-off-by: Jordan Keister <jordan@nimblewidget.com> Co-authored-by: Joe Lanford <joe.lanford@gmail.com> Upstream-repository: operator-registry Upstream-commit: c80e8751e716c069017b55279a0f29d0254d426a

perdasilva · 2024-09-11T06:07:04Z

/label backport-risk-assessed
/jira refresh

openshift-ci-robot · 2024-09-11T06:07:08Z

@perdasilva: This pull request references Jira Issue OCPBUGS-41540, which is invalid:

expected dependent Jira Issue OCPBUGS-39458 to target a version in 4.17.0, but it targets "4.17.z" instead

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:

/label backport-risk-assessed
/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.

perdasilva · 2024-09-11T06:09:19Z

/jira refresh

openshift-ci-robot · 2024-09-11T06:09:25Z

@perdasilva: This pull request references Jira Issue OCPBUGS-41540, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.16.z) matches configured target version for branch (4.16.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-39458 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-39458 targets the "4.17.0" version, which is one of the valid target versions: 4.17.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jfan@redhat.com), skipping review request.

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.

perdasilva · 2024-09-12T07:34:00Z

/lgtm

bandrade · 2024-09-16T16:17:52Z

/label cherry-pick-approved

openshift-ci-robot · 2024-09-16T17:25:12Z

/retest-required

Remaining retests: 0 against base HEAD c4c6542 and 2 for PR HEAD ee2a081 in total

openshift-ci-robot · 2024-09-16T18:37:42Z

/retest-required

Remaining retests: 0 against base HEAD c4c6542 and 2 for PR HEAD ee2a081 in total

bandrade · 2024-09-16T22:18:18Z

/retest

openshift-ci-robot · 2024-09-17T03:53:48Z

/retest-required

Remaining retests: 0 against base HEAD c4c6542 and 2 for PR HEAD ee2a081 in total

openshift-ci · 2024-09-17T06:58:47Z

@grokspawn: all tests passed!

Full PR test history. Your PR dashboard.

Details

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

openshift-ci-robot · 2024-09-17T07:02:46Z

@grokspawn: Jira Issue OCPBUGS-41540: All pull requests linked via external trackers have merged:

openshift/operator-framework-olm#859

Jira Issue OCPBUGS-41540 has been moved to the MODIFIED state.

Details

In response to this:

Allow disabling of migrations for bundles and sqlite DBs

intro new migrations package

schema migration optional; default to olm.bundle.object

review resolutions

use a type to protect migration interactions

review revisions

Upstream-repository: operator-registry
Upstream-commit: c80e8751e716c069017b55279a0f29d0254d426a

some notes about this backport

changes were intertwined with basic template schema definition changes in 4.17 which required some manual intervention in the merge to avoid propagating

in 4.17+ the composite template was removed. In 4.16 is has not been, so to match expectations of any users, this commit enables all migrations for basic & semver template builders of composite template

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-bot · 2024-09-17T10:40:10Z

[ART PR BUILD NOTIFIER]

Distgit: operator-registry
This PR has been included in build operator-registry-container-v4.16.0-202409171005.p0.gc50e9ce.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2024-09-17T10:43:09Z

[ART PR BUILD NOTIFIER]

Distgit: ose-operator-framework-tools
This PR has been included in build ose-operator-framework-tools-container-v4.16.0-202409171005.p0.gc50e9ce.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2024-09-17T10:52:11Z

[ART PR BUILD NOTIFIER]

Distgit: operator-lifecycle-manager
This PR has been included in build operator-lifecycle-manager-container-v4.16.0-202409171005.p0.gc50e9ce.assembly.stream.el9.
All builds following this will include this PR.

openshift-merge-robot · 2024-09-17T16:55:42Z

Fix included in accepted release 4.16.0-0.nightly-2024-09-17-112842

grokspawn · 2024-09-17T19:20:20Z

/cherrypick release-4.15

openshift-cherrypick-robot · 2024-09-17T19:21:09Z

@grokspawn: #859 failed to apply on top of branch "release-4.15":

Applying: add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384)
Using index info to reconstruct a base tree...
M	staging/operator-registry/alpha/action/render.go
M	staging/operator-registry/alpha/action/render_test.go
M	staging/operator-registry/alpha/template/composite/builder.go
M	staging/operator-registry/alpha/template/semver/semver.go
M	staging/operator-registry/alpha/template/semver/types.go
M	staging/operator-registry/cmd/opm/render/cmd.go
M	vendor/github.com/operator-framework/operator-registry/alpha/action/render.go
M	vendor/github.com/operator-framework/operator-registry/alpha/template/composite/builder.go
M	vendor/github.com/operator-framework/operator-registry/alpha/template/semver/semver.go
M	vendor/github.com/operator-framework/operator-registry/alpha/template/semver/types.go
M	vendor/github.com/operator-framework/operator-registry/cmd/opm/render/cmd.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging vendor/github.com/operator-framework/operator-registry/cmd/opm/render/cmd.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/cmd/opm/render/cmd.go
Auto-merging vendor/github.com/operator-framework/operator-registry/alpha/template/semver/types.go
Auto-merging vendor/github.com/operator-framework/operator-registry/alpha/template/semver/semver.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/alpha/template/semver/semver.go
Auto-merging vendor/github.com/operator-framework/operator-registry/alpha/template/composite/builder.go
Auto-merging vendor/github.com/operator-framework/operator-registry/alpha/action/render.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/alpha/action/render.go
Auto-merging staging/operator-registry/cmd/opm/render/cmd.go
CONFLICT (content): Merge conflict in staging/operator-registry/cmd/opm/render/cmd.go
Auto-merging staging/operator-registry/alpha/template/semver/types.go
Auto-merging staging/operator-registry/alpha/template/semver/semver.go
CONFLICT (content): Merge conflict in staging/operator-registry/alpha/template/semver/semver.go
Auto-merging staging/operator-registry/alpha/template/composite/builder.go
Auto-merging staging/operator-registry/alpha/action/render_test.go
CONFLICT (content): Merge conflict in staging/operator-registry/alpha/action/render_test.go
Auto-merging staging/operator-registry/alpha/action/render.go
CONFLICT (content): Merge conflict in staging/operator-registry/alpha/action/render.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 add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384)
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".

Details

In response to this:

/cherrypick release-4.15

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.

grokspawn · 2024-09-17T20:14:16Z

release-4.15 manual cherry-pick is #870

openshift-ci Bot requested review from ankitathomas and oceanc80 September 9, 2024 19:39

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 9, 2024

grokspawn mentioned this pull request Sep 9, 2024

OCPBUGS-39458: add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384) #851

Merged

openshift-ci Bot changed the title ~~✨ add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384)~~ OCPBUGS-41540: ✨ add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384) Sep 9, 2024

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 9, 2024

grokspawn force-pushed the bundle-metadata-4.16 branch 2 times, most recently from 4b028ca to a85e3f6 Compare September 9, 2024 19:55

grokspawn changed the title ~~OCPBUGS-41540: ✨ add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384)~~ OCPBUGS-41540: [4.16] add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384) Sep 9, 2024

grokspawn force-pushed the bundle-metadata-4.16 branch from a85e3f6 to ee2a081 Compare September 9, 2024 20:52

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 11, 2024

openshift-ci Bot assigned bandrade, emmajiafan, jianzhangbjz, KeenonLee, kuiwang02 and Xia-Zhao-rh Sep 11, 2024

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 11, 2024

openshift-ci Bot assigned perdasilva Sep 12, 2024

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 12, 2024

openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 16, 2024

openshift-merge-bot Bot merged commit c50e9ce into openshift:release-4.16 Sep 17, 2024

grokspawn deleted the bundle-metadata-4.16 branch September 17, 2024 14:48

Conversation

grokspawn commented Sep 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

some notes about this backport

Uh oh!

openshift-ci Bot commented Sep 9, 2024

Uh oh!

grokspawn commented Sep 9, 2024

Uh oh!

openshift-ci-robot commented Sep 9, 2024

Uh oh!

openshift-ci-robot commented Sep 9, 2024

Uh oh!

perdasilva commented Sep 11, 2024

Uh oh!

openshift-ci-robot commented Sep 11, 2024

Uh oh!

perdasilva commented Sep 11, 2024

Uh oh!

openshift-ci-robot commented Sep 11, 2024

Uh oh!

perdasilva commented Sep 12, 2024

Uh oh!

bandrade commented Sep 16, 2024

Uh oh!

openshift-ci-robot commented Sep 16, 2024

Uh oh!

openshift-ci-robot commented Sep 16, 2024

Uh oh!

bandrade commented Sep 16, 2024

Uh oh!

openshift-ci-robot commented Sep 17, 2024

Uh oh!

openshift-ci Bot commented Sep 17, 2024

Uh oh!

openshift-ci-robot commented Sep 17, 2024

some notes about this backport

Uh oh!

openshift-bot commented Sep 17, 2024

Uh oh!

openshift-bot commented Sep 17, 2024

Uh oh!

openshift-bot commented Sep 17, 2024

Uh oh!

openshift-merge-robot commented Sep 17, 2024

Uh oh!

grokspawn commented Sep 17, 2024

Uh oh!

openshift-cherrypick-robot commented Sep 17, 2024

Uh oh!

grokspawn commented Sep 17, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

grokspawn commented Sep 9, 2024 •

edited

Loading