Bug 1829832: support mirroring for index images #438
Conversation
prior to this commit, it was assumed that the database file has the name bundles.db in the designated folder. newer index images use a label to indicate location and default to /database/index.db, which required a two-step workaround to mirror with oc adm catalog mirror. after this change, oc adm catalog mirror with the flag `--path="/database/index.db:./"` will work as expected for non-standard db locations.
index images come with a label indicating where in the image the db file can be found. this commit checks for the label before attempting to extract the db if an explicit path is provided, it is preferred to the label value
openshift-ci-robot
added
the
bugzilla/severity-high
|
@ecordell: This pull request references Bugzilla bug 1829832, 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. 3 validation(s) were run on this bug
In response to this:
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
added
the
bugzilla/valid-bug
|
@ecordell: This pull request references Bugzilla bug 1829832, which is valid. 3 validation(s) were run on this bug
In response to this:
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. |
| if info.IsDir() { | ||
| return nil | ||
| } | ||
| if _, err := sqlittle.Open(path); err == nil { |
There was a problem hiding this comment.
Is it possible that more than one valid sqlite database file will be present there?
There was a problem hiding this comment.
Possible but unlikely (no tooling for building these images will do it) - but if that's the case, the output will indicate which one was picked, and if it's not the one you wanted you can override with --path
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ecordell, soltysh 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 |
openshift-ci-robot
added
the
approved
|
/retest Please review the full test history for this PR and help us cut down flakes. |
1 similar comment
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
@ecordell: All pull requests linked via external trackers have merged: openshift/oc#438. Bugzilla bug 1829832 has been moved to the MODIFIED state. In response to this:
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. |
oc adm catalog mirrorinitially targeted "registry images" built viaoc adm catalog build.Newer
opmtooling creates index images with slight differences. This PR accounts for them in two ways:--pathflag.mirrornow detects the "index label", if present, and uses that to find the database in the image.--pathtakes precedence, if present.