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

grokspawn · 2024-09-03T23:55:47Z

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

…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

openshift-ci · 2024-09-03T23:56:13Z

[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-03T23:57:05Z

/jira cherry-pick OCPBUGS-37819

openshift-ci-robot · 2024-09-03T23:57:13Z

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

Details

In response to this:

/jira cherry-pick OCPBUGS-37819

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-03T23:57:22Z

@grokspawn: This pull request references Jira Issue OCPBUGS-39458, 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 (4.18.0) matches configured target version for branch (4.18.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

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

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.

openshift-cherrypick-robot · 2024-09-04T00:03:07Z

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

Details

In response to this:

/cherrypick release-4.16,release-4.15,release-4.14

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-04T00:04:26Z

/cherrypick release-4.16 release-4.15 release-4.14

openshift-cherrypick-robot · 2024-09-04T00:04:28Z

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

Details

In response to this:

/cherrypick release-4.16 release-4.15 release-4.14

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-robot · 2024-09-04T01:17:04Z

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

expected the bug to target either version "4.17." or "openshift-4.17.", but it targets "4.18.0" instead
release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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:

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.

grokspawn · 2024-09-04T01:17:52Z

/jira refresh

openshift-ci-robot · 2024-09-04T01:17:56Z

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

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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:

/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.

grokspawn · 2024-09-04T01:25:51Z

/jira refresh

openshift-ci-robot · 2024-09-04T01:25:56Z

@grokspawn: This pull request references Jira Issue OCPBUGS-39458, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.17.0) matches configured target version for branch (4.17.0)
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-37819 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-37819 targets the "4.18.0" version, which is one of the valid target versions: 4.18.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.

kevinrizza · 2024-09-04T01:55:52Z

/retest
/lgtm
/label backport-risk-assessed

jianzhangbjz · 2024-09-04T02:16:55Z

/label cherry-pick-approved

openshift-ci-robot · 2024-09-04T04:19:44Z

/retest-required

Remaining retests: 0 against base HEAD a3a385e and 2 for PR HEAD 1d794e4 in total

openshift-ci-robot · 2024-09-04T07:59:55Z

/retest-required

Remaining retests: 0 against base HEAD a3a385e and 2 for PR HEAD 1d794e4 in total

m1kola · 2024-09-04T08:32:29Z

/retest

m1kola · 2024-09-04T10:42:28Z

/retest

grokspawn · 2024-09-04T13:57:47Z

ci/prow/e2e-gcp-console-olm appears to have at least one failure because it is attempting to install the lightspeed-operator from redhat-operators-index catalog in 4.17.
This package does not exist there.
Gonna kick to see if it's transient (catalogs are being rebuilt all the time).

grokspawn · 2024-09-04T13:57:54Z

/retest

openshift-ci · 2024-09-04T16:01:34Z

@grokspawn: 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-upgrade	`1d794e4`	link	true	`/test e2e-upgrade`

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-04T16:05:17Z

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

openshift/operator-framework-olm#851

Jira Issue OCPBUGS-39458 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

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-cherrypick-robot · 2024-09-04T16:06:15Z

@grokspawn: #851 failed to apply on top of branch "release-4.16":

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/template/basic/basic.go
M	staging/operator-registry/cmd/opm/alpha/template/basic.go
M	staging/operator-registry/cmd/opm/alpha/template/semver.go
M	staging/operator-registry/cmd/opm/render/cmd.go
M	staging/operator-registry/pkg/server/server_test.go
M	vendor/github.com/operator-framework/operator-registry/alpha/action/render.go
M	vendor/github.com/operator-framework/operator-registry/alpha/template/basic/basic.go
M	vendor/github.com/operator-framework/operator-registry/cmd/opm/alpha/template/basic.go
M	vendor/github.com/operator-framework/operator-registry/cmd/opm/alpha/template/semver.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
Auto-merging vendor/github.com/operator-framework/operator-registry/cmd/opm/alpha/template/semver.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/cmd/opm/alpha/template/semver.go
Auto-merging vendor/github.com/operator-framework/operator-registry/cmd/opm/alpha/template/basic.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/cmd/opm/alpha/template/basic.go
Auto-merging vendor/github.com/operator-framework/operator-registry/alpha/template/basic/basic.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/pkg/server/server_test.go
CONFLICT (content): Merge conflict in staging/operator-registry/pkg/server/server_test.go
Auto-merging staging/operator-registry/cmd/opm/render/cmd.go
Auto-merging staging/operator-registry/cmd/opm/alpha/template/semver.go
CONFLICT (content): Merge conflict in staging/operator-registry/cmd/opm/alpha/template/semver.go
Auto-merging staging/operator-registry/cmd/opm/alpha/template/basic.go
CONFLICT (content): Merge conflict in staging/operator-registry/cmd/opm/alpha/template/basic.go
Auto-merging staging/operator-registry/alpha/template/basic/basic.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.16 release-4.15 release-4.14

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-bot · 2024-09-04T19:51:23Z

[ART PR BUILD NOTIFIER]

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

openshift-bot · 2024-09-04T19:54:24Z

[ART PR BUILD NOTIFIER]

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

openshift-bot · 2024-09-04T19:57:23Z

[ART PR BUILD NOTIFIER]

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

grokspawn · 2024-09-09T19:42:52Z

backport to 4.16: #859

openshift-ci Bot requested review from joelanford and m1kola September 3, 2024 23:56

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

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

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

grokspawn changed the base branch from master to release-4.17 September 4, 2024 01:16

openshift-ci-robot added jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. and removed jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 4, 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 4, 2024

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 4, 2024

openshift-ci Bot assigned bandrade, emmajiafan, jianzhangbjz and KeenonLee Sep 4, 2024

openshift-ci Bot assigned kuiwang02, Xia-Zhao-rh and kevinrizza Sep 4, 2024

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 4, 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 4, 2024

openshift-merge-bot Bot merged commit ae8f50d into openshift:release-4.17 Sep 4, 2024

grokspawn deleted the bundle-metadata-4.17 branch September 4, 2024 16:24

Conversation

grokspawn commented Sep 3, 2024

Uh oh!

openshift-ci Bot commented Sep 3, 2024

Uh oh!

grokspawn commented Sep 3, 2024

Uh oh!

openshift-ci-robot commented Sep 3, 2024

Uh oh!

openshift-ci-robot commented Sep 3, 2024

Uh oh!

openshift-cherrypick-robot commented Sep 4, 2024

Uh oh!

grokspawn commented Sep 4, 2024

Uh oh!

openshift-cherrypick-robot commented Sep 4, 2024

Uh oh!

openshift-ci-robot commented Sep 4, 2024

Uh oh!

grokspawn commented Sep 4, 2024

Uh oh!

openshift-ci-robot commented Sep 4, 2024

Uh oh!

grokspawn commented Sep 4, 2024

Uh oh!

openshift-ci-robot commented Sep 4, 2024

Uh oh!

kevinrizza commented Sep 4, 2024

Uh oh!

jianzhangbjz commented Sep 4, 2024

Uh oh!

openshift-ci-robot commented Sep 4, 2024

Uh oh!

openshift-ci-robot commented Sep 4, 2024

Uh oh!

m1kola commented Sep 4, 2024

Uh oh!

m1kola commented Sep 4, 2024

Uh oh!

grokspawn commented Sep 4, 2024

Uh oh!

grokspawn commented Sep 4, 2024

Uh oh!

openshift-ci Bot commented Sep 4, 2024

Uh oh!

openshift-ci-robot commented Sep 4, 2024

Uh oh!

openshift-cherrypick-robot commented Sep 4, 2024

Uh oh!

openshift-bot commented Sep 4, 2024

Uh oh!

openshift-bot commented Sep 4, 2024

Uh oh!

openshift-bot commented Sep 4, 2024

Uh oh!

grokspawn commented Sep 9, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants