Skip to content

Add OLM mirroring using offline media #30230

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
Merged
adellape merged 1 commit into from
Mar 12, 2021
Merged

Add OLM mirroring using offline media #30230

adellape merged 1 commit into from
Mar 12, 2021

Conversation

@adellape
Copy link
Contributor

@adellape adellape commented Mar 9, 2021 •
edited
Loading

https://issues.redhat.com/browse/OSDOCS-1384 (also related to https://bugzilla.redhat.com/show_bug.cgi?id=1841885)

Preview: Mirroring an Operator catalog

  • Update the "Mirroring an Operator catalog" procedure to include two options in step 3: either mirroring directly to a target mirror registry, or first mirroring the files locally and then moving removable/offline media to another host (the airgapped scenario).
  • Modify the target registry path in oc adm catalog mirror commands to include /<namespace>, so that the mirroring process can transform the paths in the ISCP accordingly.
  • Mention in the "Disabling the default OperatorHub sources" section as a [TIP] that the web console can now also be used to manage catalog sources.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 9, 2021
@adellape adellape changed the title Add OLM mirroring using offline media [WIP] Add OLM mirroring using offline media Mar 9, 2021
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 9, 2021
@netlify
Copy link

netlify bot commented Mar 9, 2021 •
edited
Loading

Deploy preview for osdocs ready!

Built with commit 85d28c9

https://deploy-preview-30230--osdocs.netlify.app

@adellape adellape force-pushed the olm_offline branch 5 times, most recently from 35a7475 to 59d963b Compare March 9, 2021 19:01
@adellape adellape changed the title [WIP] Add OLM mirroring using offline media Add OLM mirroring using offline media Mar 9, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 9, 2021
adellape
adellape commented Mar 9, 2021
View reviewed changes
@adellape adellape added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 9, 2021
@adellape adellape added this to the Next Release milestone Mar 9, 2021
@adellape
Copy link
Contributor Author

adellape commented Mar 9, 2021

@ecordell This adds file:/// usage to the mirroring docs.

kalexand-rh
kalexand-rh reviewed Mar 10, 2021
View reviewed changes
Copy link
Contributor

@kalexand-rh kalexand-rh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a few picky things and some suggestions, but this is looking good!

@kalexand-rh kalexand-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Mar 10, 2021
@jianzhangbjz
Copy link
Member

jianzhangbjz commented Mar 11, 2021 •
edited
Loading

@bandrade Could you help review it? Thanks!

@jianzhangbjz
Copy link
Member

jianzhangbjz commented Mar 11, 2021

/assign @bandrade

@bandrade
Copy link

bandrade commented Mar 11, 2021

Agree with @kalexand-rh suggestions, besides that LGTM. Thank you
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2021
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2021
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 11, 2021

New changes are detected. LGTM label has been removed.

@adellape adellape force-pushed the olm_offline branch 12 times, most recently from 5deabd4 to 30dd250 Compare March 12, 2021 19:28
@adellape adellape merged commit 5bea570 into openshift:master Mar 12, 2021
@adellape
Copy link
Contributor Author

adellape commented Mar 12, 2021

/cherrypick enterprise-4.8

@adellape
Copy link
Contributor Author

adellape commented Mar 12, 2021

/cherrypick enterprise-4.7

@adellape
Copy link
Contributor Author

adellape commented Mar 12, 2021

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 12, 2021

@adellape: new pull request created: #30412

Details

In response to this:

/cherrypick enterprise-4.8

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.

This was referenced Mar 12, 2021
Merged
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 12, 2021

@adellape: new pull request created: #30413

Details

In response to this:

/cherrypick enterprise-4.7

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-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 12, 2021

@adellape: #30230 failed to apply on top of branch "enterprise-4.6":

Applying: Add OLM mirroring using offline media
Using index info to reconstruct a base tree...
M	modules/olm-creating-catalog-from-index.adoc
M	modules/olm-pruning-index-image.adoc
M	operators/admin/olm-restricted-networks.adoc
Falling back to patching base and 3-way merge...
Auto-merging operators/admin/olm-restricted-networks.adoc
Auto-merging modules/olm-pruning-index-image.adoc
Auto-merging modules/olm-creating-catalog-from-index.adoc
CONFLICT (content): Merge conflict in modules/olm-creating-catalog-from-index.adoc
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 OLM mirroring using offline media
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 enterprise-4.6

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.

This was referenced Mar 12, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kalexand-rh kalexand-rh kalexand-rh left review comments

Assignees

@bandrade bandrade

Labels

branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

6 participants

@adellape @jianzhangbjz @bandrade @openshift-ci-robot @openshift-cherrypick-robot @kalexand-rh