Revert "Merge pull request #76555 from subhtk/ocm-v1"

This reverts commit 690b892, reversing
changes made to c136038.

Conflicts:
  modules/oc-mirror-imageset-config-params.adoc

Resolved conflicts by keeping the "4.16" version bump that happened via PR 76649, but set back the commas instead of colons to their pre-76555 state.

Author: adellape

installing/disconnected_install/installing-mirroring-disconnected.adoc

@@ -1,81 +1,91 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="installing-mirroring-disconnected_{context}"]
-= Mirroring images for a disconnected installation using the oc-mirror plugin v1
+[id="installing-mirroring-disconnected"]
+= Mirroring images for a disconnected installation using the oc-mirror plugin
 include::_attributes/common-attributes.adoc[]
 :context: installing-mirroring-disconnected
 
 toc::[]
 
-Running your cluster in a restricted network without direct internet connectivity is possible by installing the cluster from a mirrored set of {product-title} container images in a private registry. This registry must be running at all times as long as the cluster is running. See "Prerequisites" section for more information.
+Running your cluster in a restricted network without direct internet connectivity is possible by installing the cluster from a mirrored set of {product-title} container images in a private registry. This registry must be running at all times as long as the cluster is running. See the xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#prerequisites_installing-mirroring-disconnected[Prerequisites] section for more information.
+
+You can use the oc-mirror OpenShift CLI (`oc`) plugin to mirror images to a mirror registry in your fully or partially disconnected environments. You must run oc-mirror from a system with internet connectivity in order to download the required images from the official Red Hat registries.
 
 // About the oc-mirror plugin
 include::modules/oc-mirror-about.adoc[leveloffset=+1]
 
 // oc-mirror compatibility and support
 include::modules/oc-mirror-support.adoc[leveloffset=+1]
 
-[id="prerequisites_installing-mirroring-disconnected_{context}"]
+[role="_additional-resources"]
+.Additional resources
+
+* For information on updating oc-mirror, see xref:../../installing/validating-an-installation.adoc#viewing-the-image-pull-source_validating-an-installation[Viewing the image pull source].
+
+// About the mirror registry
+include::modules/installation-about-mirror-registry.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+
+* For information about viewing the CRI-O logs to view the image source, see xref:../../installing/validating-an-installation.adoc#viewing-the-image-pull-source_validating-an-installation[Viewing the image pull source].
+
+[id="prerequisites_installing-mirroring-disconnected"]
 == Prerequisites
 
-* You must have a container image registry, which is referred as the mirror registry, that supports link:https://docs.docker.com/registry/spec/manifest-v2-2[Docker v2-2] in the location that hosts the {product-title} cluster, such as {quay}.
+* You must have a container image registry that supports link:https://docs.docker.com/registry/spec/manifest-v2-2[Docker v2-2] in the location that will host the {product-title} cluster, such as Red Hat Quay.
 +
 [NOTE]
 ====
-If you use {quay}, you must use version 3.6 or later with the oc-mirror plugin. If you have an entitlement to {quay}, see the documentation on deploying {quay} link:https://access.redhat.com/documentation/en-us/red_hat_quay/3/html/deploy_red_hat_quay_for_proof-of-concept_non-production_purposes/[for proof-of-concept purposes] or link:https://access.redhat.com/documentation/en-us/red_hat_quay/3/html/deploying_the_red_hat_quay_operator_on_openshift_container_platform/index[by using the Red Hat Quay Operator]. If you need additional assistance selecting and installing a registry, contact your sales representative or Red Hat Support.
+If you use Red Hat Quay, you must use version 3.6 or later with the oc-mirror plugin. If you have an entitlement to Red Hat Quay, see the documentation on deploying Red Hat Quay link:https://access.redhat.com/documentation/en-us/red_hat_quay/3/html/deploy_red_hat_quay_for_proof-of-concept_non-production_purposes/[for proof-of-concept purposes] or link:https://access.redhat.com/documentation/en-us/red_hat_quay/3/html/deploying_the_red_hat_quay_operator_on_openshift_container_platform/index[by using the Red Hat Quay Operator]. If you need additional assistance selecting and installing a registry, contact your sales representative or Red Hat Support.
 ====
 +
-If you do not already have an existing solution for a mirror registry, the subscribers of {product-title} are provided in "Creating a mirror registry with mirror registry for Red Hat OpenShift".
+If you do not already have an existing solution for a container image registry, subscribers of {product-title} are provided a xref:../../installing/disconnected_install/installing-mirroring-creating-registry.adoc#installing-mirroring-creating-registry[mirror registry for Red Hat OpenShift]. The _mirror registry for Red Hat OpenShift_ is included with your subscription and is a small-scale container registry that can be used to mirror the required container images of {product-title} in disconnected installations.
 
-* The mirror registry must be reachable by every machine in the clusters that you provision. If the registry is unreachable, installation, updating, or normal operations such as workload relocation might fail. For this reason, you must run mirror registries ensuring highly availability. The mirror registries must meet or exceed the production availability of your {product-title} clusters.
+[id="mirroring-preparing-your-hosts"]
+== Preparing your mirror hosts
 
-* You have set the umask parameter to `0022` on the operating system that uses oc-mirror plugin v1.
+Before you can use the oc-mirror plugin to mirror images, you must install the plugin and create a container image registry credentials file to allow the mirroring from Red Hat to your mirror.
+
+// Installing the oc-mirror OpenShift CLI plugin
+include::modules/oc-mirror-installing-plugin.adoc[leveloffset=+2]
 
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../installing/disconnected_install/installing-mirroring-creating-registry.adoc#installing-mirroring-creating-registry[Creating a mirror registry with mirror registry for Red Hat OpenShift]
-
-[id="mirroring-preparing-your-hosts_{context}"]
-== Preparing your mirror hosts
-
-To use the oc-mirror plugin v1 to mirror images, you need to install the plugin and create a container image registry credentials file to enable mirroring from Red Hat to your mirror.
-
-// Installing the oc-mirror OpenShift CLI plugin v1
-include::modules/oc-mirror-installing-plugin.adoc[leveloffset=+2]
+* xref:../../cli_reference/openshift_cli/extending-cli-plugins.adoc#cli-installing-plugins_cli-extend-plugins[Installing and using CLI plugins]
 
 // Configuring credentials that allow images to be mirrored
 include::modules/installation-adding-registry-pull-secret.adoc[leveloffset=+2]
 
-// About Image set configuration
-include::modules/oc-mirror-about-image-set-config.adoc[leveloffset=+1]
-
 // Creating the image set configuration
-include::modules/oc-mirror-creating-image-set-config.adoc[leveloffset=+2]
+include::modules/oc-mirror-creating-image-set-config.adoc[leveloffset=+1]
 
-// Image set configuration parameters
-include::modules/oc-mirror-imageset-config-params.adoc[leveloffset=+2]
+[role="_additional-resources"]
+.Additional resources
 
-// Image set configuration examples
-include::modules/oc-mirror-image-set-config-examples.adoc[leveloffset=+2]
+* xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#oc-mirror-imageset-config-params_installing-mirroring-disconnected[Image set configuration parameters]
+* xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#oc-mirror-image-set-examples_installing-mirroring-disconnected[Image set configuration examples]
+* xref:../../updating/updating_a_cluster/updating_disconnected_cluster/disconnected-update-osus.adoc#update-service-overview_updating-restricted-network-cluster-osus[Using the OpenShift Update Service in a disconnected environment]
 
-// Setting up for incremental mirroring
-include::modules/oc-mirror-setting-incremental-mirroring.adoc[leveloffset=+1]
+[id="mirroring-image-set"]
+== Mirroring an image set to a mirror registry
 
-[role="_additional-resources"]
-.Additional resources
+You can use the oc-mirror CLI plugin to mirror images to a mirror registry in a xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#mirroring-image-set-partial[partially disconnected environment] or in a xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#mirroring-image-set-full[fully disconnected environment].
+
+These procedures assume that you already have your mirror registry set up.
 
-* xref:../../updating/updating_a_cluster/updating_disconnected_cluster/disconnected-update-osus.adoc#update-service-overview_updating-restricted-network-cluster-osus[Updating a cluster in a disconnected environment using the OpenShift Update Service]
+[id="mirroring-image-set-partial"]
+=== Mirroring an image set in a partially disconnected environment
 
-* xref:../../cli_reference/openshift_cli/extending-cli-plugins.adoc#cli-installing-plugins_cli-extend-plugins[Extending the OpenShift CLI with plugins]
+In a partially disconnected environment, you can mirror an image set directly to the target mirror registry.
 
-// Mirroring an image set to a mirror registry
-include::modules/oc-mirror-mirroring-image-set.adoc[leveloffset=+1]
+// Mirroring from mirror to mirror
+include::modules/oc-mirror-mirror-to-mirror.adoc[leveloffset=+3]
 
-// Mirroring from partially disconnected environment:mirror to mirror
-include::modules/oc-mirror-mirror-to-mirror.adoc[leveloffset=+2]
+[id="mirroring-image-set-full"]
+=== Mirroring an image set in a fully disconnected environment
 
-// Mirroring from fully disconnected environment
-include::modules/oc-mirror-fully-disconnected.adoc[leveloffset=+2]
+To mirror an image set in a fully disconnected environment, you must first xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#oc-mirror-mirror-to-disk_installing-mirroring-disconnected[mirror the image set to disk], then xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#oc-mirror-disk-to-mirror_installing-mirroring-disconnected[mirror the image set file on disk to a mirror].
 
 // Mirroring from mirror to disk
 include::modules/oc-mirror-mirror-to-disk.adoc[leveloffset=+3]
@@ -86,34 +96,42 @@ include::modules/oc-mirror-disk-to-mirror.adoc[leveloffset=+3]
 // Configuring your cluster to use the resources generated by oc-mirror
 include::modules/oc-mirror-updating-cluster-manifests.adoc[leveloffset=+1]
 
-[role="_additional-resources"]
-.Additional resources
-
-* xref:../../updating/understanding_updates/intro-to-updates.adoc#update-service-about_understanding-openshift-updates[About the OpenShift Update Service]
-
 // About updating your mirror registry content
 include::modules/oc-mirror-updating-registry-about.adoc[leveloffset=+1]
 
-// Use-cases
 include::modules/oc-mirror-updating-use-cases.adoc[leveloffset=+2]
 
+[role="_additional-resources"]
+.Additional resources
+
+* xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#oc-mirror-image-set-examples_installing-mirroring-disconnected[Image set configuration examples]
+* xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#mirroring-image-set-partial[Mirroring an image set in a partially disconnected environment]
+* xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#mirroring-image-set-full[Mirroring an image set in a fully disconnected environment]
+* xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#oc-mirror-updating-cluster-manifests_installing-mirroring-disconnected[Configuring your cluster to use the resources generated by oc-mirror]
+
 // Performing a dry run
 include::modules/oc-mirror-dry-run.adoc[leveloffset=+1]
 
 // Including local OCI Operator catalogs
 include::modules/oc-mirror-oci-format.adoc[leveloffset=+1]
 
-// Additional resources
+[role="_additional-resources"]
+.Additional resources
 
 // TODO: This title might need to update per sebastian's PR
-// Configuring your cluster to use the resources generated by oc-mirror
+* xref:../../installing/disconnected_install/installing-mirroring-disconnected.adoc#oc-mirror-updating-cluster-manifests_installing-mirroring-disconnected[Configuring your cluster to use the resources generated by oc-mirror]
+
+// Image set configuration parameters
+include::modules/oc-mirror-imageset-config-params.adoc[leveloffset=+1]
+
+// Image set configuration examples
+include::modules/oc-mirror-image-set-config-examples.adoc[leveloffset=+1]
 
 // Command reference for oc-mirror
 include::modules/oc-mirror-command-reference.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
+[id="additional-resources_installing-mirroring-disconnected"]
 == Additional resources
 
 * xref:../../updating/updating_a_cluster/updating_disconnected_cluster/index.adoc#about-restricted-network-updates[About cluster updates in a disconnected environment]
-
-* xref:../../installing/validating-an-installation.adoc#viewing-the-image-pull-source_validating-an-installation[Viewing the image pull source]

modules/installation-adding-registry-pull-secret.adoc

@@ -22,18 +22,23 @@ endif::[]
 
 :_mod-docs-content-type: PROCEDURE
 [id="installation-adding-registry-pull-secret_{context}"]
-= Configuring credentials to enable mirroring images
+= Configuring credentials that allow images to be mirrored
 
-Follow the procedure to create a container image registry credentials file for mirroring images from Red Hat to your mirror registry.
+Create a container image registry credentials file that allows mirroring
+images from Red Hat to your mirror.
 
 ifdef::restricted[]
 [WARNING]
 ====
-Do not use this image registry credentials file as the pull secret when installing a cluster. Using this file will grant write access to your mirror registry for all machines in the cluster.
+Do not use this image registry credentials file as the pull secret when you install a cluster. If you provide this file when you install cluster, all of the machines in the cluster will have write access to your mirror registry.
 ====
 endif::restricted[]
 
 ifdef::restricted[]
+[WARNING]
+====
+This process requires that you have write access to a container image registry on the mirror registry and adds the credentials to a registry pull secret.
+====
 
 endif::restricted[]
 
@@ -47,8 +52,6 @@ endif::openshift-rosa,openshift-dedicated[]
 ifdef::restricted[]
 * You identified an image repository location on your mirror registry to mirror images into.
 * You provisioned a mirror registry account that allows images to be uploaded to that image repository.
-* You have write access to the mirror registry. 
-* You included the credentials in the registry pull secret.
 endif::restricted[]
 
 .Procedure