Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions _topic_maps/_topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,22 +124,18 @@ Topics:
File: about
- Name: Converting a connected cluster to a disconnected cluster
File: connected-to-disconnected
- Name: Mirroring in disconnected environments
Dir: mirroring
Distros: openshift-origin,openshift-enterprise
Topics:
- Name: About disconnected installation mirroring
File: index
- Name: Creating a mirror registry with mirror registry for Red Hat OpenShift
File: installing-mirroring-creating-registry
- Name: Mirroring images for a disconnected installation using oc-mirror plugin v2
File: about-installing-oc-mirror-v2
- Name: Migrating from oc-mirror plugin v1 to v2
File: oc-mirror-migration-v1-to-v2
- Name: Mirroring images for a disconnected installation using the oc-mirror plugin v1
File: installing-mirroring-disconnected
- Name: Mirroring images for a disconnected installation by using the oc adm command
File: installing-mirroring-installation-images
- Name: About disconnected installation mirroring
File: index
- Name: Creating a mirror registry with mirror registry for Red Hat OpenShift
File: installing-mirroring-creating-registry
- Name: Mirroring images for a disconnected installation using oc-mirror plugin v2
File: about-installing-oc-mirror-v2
- Name: Migrating from oc-mirror plugin v1 to v2
File: oc-mirror-migration-v1-to-v2
- Name: Mirroring images for a disconnected installation using the oc-mirror plugin v1
File: installing-mirroring-disconnected
- Name: Mirroring images for a disconnected installation by using the oc adm command
File: installing-mirroring-installation-images
- Name: Installing a cluster in a disconnected environment
File: installing
- Name: Using OLM in disconnected environments
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ include::modules/op-mirroring-images-to-run-pipelines-in-restricted-environment.

* xref:../../openshift_images/configuring-samples-operator.adoc#samples-operator-restricted-network-install[Configuring Samples Operator for a restricted cluster]

* xref:../../disconnected/mirroring/installing-mirroring-installation-images.adoc#installation-about-mirror-registry_installing-mirroring-installation-images[Creating a cluster with a mirrored registry]
* xref:../../disconnected/installing-mirroring-installation-images.adoc#installation-about-mirror-registry_installing-mirroring-installation-images[Creating a cluster with a mirrored registry]

include::modules/op-running-a-pipeline.adoc[leveloffset=+1]

Expand Down
2 changes: 1 addition & 1 deletion cicd/pipelines/installing-pipelines.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ include::modules/op-performance-tuning-using-tektonconfig-cr.adoc[leveloffset=+1

** xref:../../openshift_images/configuring-samples-operator.adoc#samples-operator-restricted-network-install[Configuring Samples Operator for a restricted cluster]

** xref:../../disconnected/mirroring/installing-mirroring-installation-images.adoc#installation-about-mirror-registry_installing-mirroring-installation-images[Creating a cluster with a mirrored registry]
** xref:../../disconnected/installing-mirroring-installation-images.adoc#installation-about-mirror-registry_installing-mirroring-installation-images[Creating a cluster with a mirrored registry]

2 changes: 1 addition & 1 deletion cli_reference/opm/cli-opm-ref.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
* xref:../../operators/understanding/olm-packaging-format.adoc#olm-file-based-catalogs_olm-packaging-format[Operator Framework packaging format]
* xref:../../operators/admin/olm-managing-custom-catalogs.adoc#olm-managing-custom-catalogs-fb[Managing custom catalogs]
* xref:../../disconnected/mirroring/installing-mirroring-disconnected.adoc#installing-mirroring-disconnected[Mirroring images for a disconnected installation using the oc-mirror plugin]
* xref:../../disconnected/installing-mirroring-disconnected.adoc#installing-mirroring-disconnected[Mirroring images for a disconnected installation using the oc-mirror plugin]
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
include::modules/opm-cli-ref-init.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ include::modules/oc-mirror-building-image-set-config-v2.adoc[leveloffset=+2]
[role="_additional-resources"]
.Additional resources

* xref:../../updating/understanding_updates/intro-to-updates.adoc#update-service-about_understanding-openshift-updates[About the OpenShift Update Service]
* xref:../updating/understanding_updates/intro-to-updates.adoc#update-service-about_understanding-openshift-updates[About the OpenShift Update Service]

//Mirroring an image set in a partially disconnected environment
include::modules/oc-mirror-workflows-partially-disconnected-v2.adoc[leveloffset=+2]
Expand All @@ -66,33 +66,33 @@ include::modules/oc-mirror-IDMS-ITMS-about.adoc[leveloffset=+1]
[role="_additional-resources"]
.Additional resources

* xref:../../rest_api/operatorhub_apis/catalogsource-operators-coreos-com-v1alpha1.html[CatalogSource]
* xref:../rest_api/operatorhub_apis/catalogsource-operators-coreos-com-v1alpha1.html[CatalogSource]

* xref:../../rest_api/config_apis/imagedigestmirrorset-config-openshift-io-v1.adoc#imagedigestmirrorset-config-openshift-io-v1[ImageDigestMirrorSet]
* xref:../rest_api/config_apis/imagedigestmirrorset-config-openshift-io-v1.adoc#imagedigestmirrorset-config-openshift-io-v1[ImageDigestMirrorSet]

* xref:../../rest_api/config_apis/imagetagmirrorset-config-openshift-io-v1.adoc#imagetagmirrorset-config-openshift-io-v1[ImageTagMirrorSet]
* xref:../rest_api/config_apis/imagetagmirrorset-config-openshift-io-v1.adoc#imagetagmirrorset-config-openshift-io-v1[ImageTagMirrorSet]

* xref:../../extensions/catalogs/managing-catalogs.adoc#olmv1-about-catalogs_managing-catalogs[About catalogs in {olmv1}]
* xref:../extensions/catalogs/managing-catalogs.adoc#olmv1-about-catalogs_managing-catalogs[About catalogs in {olmv1}]

// Restrictions on modifying oc-mirror-generated resources
include::modules/oc-mirror-restricted-fields.adoc[leveloffset=+2]

// Configuring your cluster to use the resources generated by oc-mirror
include::modules/oc-mirror-updating-cluster-manifests-v2.adoc[leveloffset=+2]

After your cluster is configured to use the resources generated by oc-mirror plugin v2, see xref:../../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#next-steps_about-installing-oc-mirror-v2[Next steps] for information about tasks that you can perform using your mirrored images.
After your cluster is configured to use the resources generated by oc-mirror plugin v2, see xref:../disconnected/about-installing-oc-mirror-v2.adoc#next-steps_about-installing-oc-mirror-v2[Next steps] for information about tasks that you can perform using your mirrored images.

[role="_additional-resources"]
.Additional resources

* xref:../../extensions/catalogs/disconnected-catalogs.adoc#disconnected-catalogs[Disconnected environment support in {olmv1}]
* xref:../extensions/catalogs/disconnected-catalogs.adoc#disconnected-catalogs[Disconnected environment support in {olmv1}]

// Deletion of images from your disconnected environment
include::modules/oc-mirror-workflows-delete-v2.adoc[leveloffset=+1]

[role="_additional-resources"]
.Additional resources
* xref:../../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#oc-mirror-v2-procedure-garbage-collector_about-installing-oc-mirror-v2[Resolving storage cleanup issues in the distribution registry]
* xref:../disconnected/about-installing-oc-mirror-v2.adoc#oc-mirror-v2-procedure-garbage-collector_about-installing-oc-mirror-v2[Resolving storage cleanup issues in the distribution registry]

include::modules/oc-mirror-v2-procedure-garbage-collector.adoc[leveloffset=+2]

Expand All @@ -119,8 +119,8 @@ include::modules/oc-mirror-proxy-support.adoc[leveloffset=+1]

[role="_additional-resources"]
.Additional resources
* xref:../../disconnected/updating/disconnected-update-osus.adoc#updating-disconnected-cluster-osus[Updating a cluster in a disconnected environment using the OpenShift Update Service]
* xref:../../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#oc-mirror-v2-procedure-garbage-collector_about-installing-oc-mirror-v2[Resolving storage cleanup issues in the distribution registry]
* xref:../disconnected/updating/disconnected-update-osus.adoc#updating-disconnected-cluster-osus[Updating a cluster in a disconnected environment using the OpenShift Update Service]
* xref:../disconnected/about-installing-oc-mirror-v2.adoc#oc-mirror-v2-procedure-garbage-collector_about-installing-oc-mirror-v2[Resolving storage cleanup issues in the distribution registry]

//signature mirroring
include::modules/oc-mirror-signature-mirroring.adoc[leveloffset=+1]
Expand All @@ -140,15 +140,15 @@ include::modules/oc-mirror-about-cache-and-workspace-dirs.adoc[leveloffset=+2]

[role="_additional-resources"]
.Additional resources
* xref:../../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#oc-mirror-updating-cluster-manifests-v2_about-installing-oc-mirror-v2[Configuring your cluster to use the resources generated by oc-mirror]
* xref:../disconnected/about-installing-oc-mirror-v2.adoc#oc-mirror-updating-cluster-manifests-v2_about-installing-oc-mirror-v2[Configuring your cluster to use the resources generated by oc-mirror]

[id="next-steps_{context}"]
== Next steps

After you mirror images to your disconnected environment using oc-mirror plugin v2, you can perform any of the following actions:

* xref:../../disconnected/installing.adoc#installing-disconnected-environments[Installing a cluster in a disconnected environment]
* xref:../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments]
* xref:../../disconnected/updating/disconnected-update-osus.adoc#updating-disconnected-cluster-osus[Updating a cluster in a disconnected environment using the OpenShift Update Service]
* xref:../disconnected/installing.adoc#installing-disconnected-environments[Installing a cluster in a disconnected environment]
* xref:../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments]
* xref:../disconnected/updating/disconnected-update-osus.adoc#updating-disconnected-cluster-osus[Updating a cluster in a disconnected environment using the OpenShift Update Service]

// Intentionally linking to the OSUS update procedure since we probably want to steer users to do that workflow as much as possible. But I can change to the index of the update section if I shouldn't be as prescriptive.
2 changes: 1 addition & 1 deletion disconnected/about.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ However, some options provide a simpler and more convenient user experience for

Unless your organizational needs require you to choose another option, use the following methods for mirroring images, installing your cluster, and updating your cluster:

* Mirror your images using the xref:../disconnected/mirroring/about-installing-oc-mirror-v2.adoc#about-installing-oc-mirror-v2[oc-mirror plugin v2].
* Mirror your images using the xref:../disconnected/about-installing-oc-mirror-v2.adoc#about-installing-oc-mirror-v2[oc-mirror plugin v2].

* Install your cluster using the xref:../installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc#installing-with-agent-based-installer[Agent-based Installer].

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ toc::[]

The _mirror registry for Red{nbsp}Hat OpenShift_ is a small and streamlined container registry that you can use as a target for mirroring the required container images of {product-title} for disconnected installations.

If you already have a container image registry, such as link:https://www.redhat.com/en/technologies/cloud-computing/quay[{quay}], you can skip this section and go straight to xref:../../disconnected/mirroring/installing-mirroring-installation-images.adoc#installation-mirror-repository_installing-mirroring-installation-images[Mirroring the {product-title} image repository].
If you already have a container image registry, such as link:https://www.redhat.com/en/technologies/cloud-computing/quay[{quay}], you can skip this section and go straight to xref:../disconnected/installing-mirroring-installation-images.adoc#installation-mirror-repository_installing-mirroring-installation-images[Mirroring the {product-title} image repository].

[IMPORTANT]
====
Expand Down Expand Up @@ -57,6 +57,6 @@ include::modules/mirror-registry-troubleshooting.adoc[leveloffset=+1]

* link:https://docs.redhat.com/en/documentation/red_hat_quay/3/html-single/securing_red_hat_quay/index#configuring-system-trust-ca[Configuring the system to trust the certificate authority]

* xref:../../disconnected/mirroring/installing-mirroring-installation-images.adoc#installation-mirror-repository_installing-mirroring-installation-images[Mirroring the {product-title} image repository]
* xref:../disconnected/installing-mirroring-installation-images.adoc#installation-mirror-repository_installing-mirroring-installation-images[Mirroring the {product-title} image repository]

* xref:../../disconnected/mirroring/installing-mirroring-installation-images.adoc#olm-mirror-catalog_installing-mirroring-installation-images[Mirroring Operator catalogs for use with disconnected clusters]
* xref:../disconnected/installing-mirroring-installation-images.adoc#olm-mirror-catalog_installing-mirroring-installation-images[Mirroring Operator catalogs for use with disconnected clusters]
Loading