OCPBUGS-42114: add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata

[perdasilva]

Fix-up of #870

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

[openshift-ci-robot]

@perdasilva: This pull request references Jira Issue OCPBUGS-42114, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.z) matches configured target version for branch (4.15.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-41540 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-41540 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
• bug has dependents

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

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

In response to this:

Fix-up of #870

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-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva

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:

• DOWNSTREAM_OWNERS [perdasilva]

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

[openshift-ci]

@perdasilva: all tests passed!

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

[emmajiafan]

/lgtm
/label qe-approved
/label cherry-pick-approved

[openshift-ci-robot]

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

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.z) matches configured target version for branch (4.15.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-41540 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-41540 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
• bug has dependents

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

In response to this:

Fix-up of #870

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.

[perdasilva]

/label backport-risk-assessed

[openshift-ci-robot]

@perdasilva: Jira Issue OCPBUGS-42114: All pull requests linked via external trackers have merged:

• openshift/operator-framework-olm#874

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

In response to this:

Fix-up of #870

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-bot]

[ART PR BUILD NOTIFIER]

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

[openshift-bot]

[ART PR BUILD NOTIFIER]

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

[openshift-merge-robot]

Fix included in accepted release 4.15.0-0.nightly-2024-09-26-223722

[grokspawn]

/cherrypick release-4.14

[openshift-cherrypick-robot]

@grokspawn: #874 failed to apply on top of branch "release-4.14":

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/migrate.go
M	staging/operator-registry/alpha/action/migrate_test.go
M	staging/operator-registry/alpha/action/render.go
M	staging/operator-registry/alpha/action/render_test.go
M	staging/operator-registry/alpha/template/semver/semver.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/migrate/cmd.go
M	staging/operator-registry/cmd/opm/render/cmd.go
M	staging/operator-registry/pkg/api/api_to_model.go
M	staging/operator-registry/pkg/registry/registry_to_model.go
M	staging/operator-registry/pkg/server/server_test.go
M	vendor/github.com/operator-framework/operator-registry/alpha/action/migrate.go
M	vendor/github.com/operator-framework/operator-registry/alpha/action/render.go
M	vendor/github.com/operator-framework/operator-registry/alpha/template/semver/semver.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/migrate/cmd.go
M	vendor/github.com/operator-framework/operator-registry/cmd/opm/render/cmd.go
M	vendor/github.com/operator-framework/operator-registry/pkg/api/api_to_model.go
M	vendor/github.com/operator-framework/operator-registry/pkg/registry/registry_to_model.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/pkg/registry/registry_to_model.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/pkg/registry/registry_to_model.go
Auto-merging vendor/github.com/operator-framework/operator-registry/pkg/api/api_to_model.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/pkg/api/api_to_model.go
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/cmd/opm/migrate/cmd.go
Auto-merging 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
Auto-merging vendor/github.com/operator-framework/operator-registry/alpha/template/semver/semver.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 vendor/github.com/operator-framework/operator-registry/alpha/action/migrate.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-registry/alpha/action/migrate.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/pkg/registry/registry_to_model.go
CONFLICT (content): Merge conflict in staging/operator-registry/pkg/registry/registry_to_model.go
Auto-merging staging/operator-registry/pkg/api/api_to_model.go
CONFLICT (content): Merge conflict in staging/operator-registry/pkg/api/api_to_model.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/cmd/opm/migrate/cmd.go
Auto-merging staging/operator-registry/cmd/opm/alpha/template/semver.go
Auto-merging staging/operator-registry/cmd/opm/alpha/template/basic.go
Auto-merging staging/operator-registry/alpha/template/semver/semver.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
Auto-merging staging/operator-registry/alpha/action/migrate_test.go
CONFLICT (content): Merge conflict in staging/operator-registry/alpha/action/migrate_test.go
Auto-merging staging/operator-registry/alpha/action/migrate.go
CONFLICT (content): Merge conflict in staging/operator-registry/alpha/action/migrate.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 add optional schema migrations; default to olm.bundle.object instead of olm.csv.metadata (#1384)

In response to this:

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