From 6df053140d08812c62da084977dc397a1de2347c Mon Sep 17 00:00:00 2001 From: dfitzmau Date: Mon, 3 Nov 2025 10:31:43 +0000 Subject: [PATCH] fix-disconnect-environment: Fixed microshift links that point to oc-mirror docs --- .../microshift-deploy-with-mirror-registry.adoc | 4 ++-- .../microshift-operators-oc-mirror-disconnected.adoc | 2 +- .../microshift-operators-oc-mirror.adoc | 12 ++++++------ .../microshift-operators-olm.adoc | 6 +++--- ...icroshift-oc-mirror-creating-imageset-config.adoc | 2 +- modules/microshift-olm-build-op-catalogs.adoc | 5 +++-- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/microshift_install_get_ready/microshift-deploy-with-mirror-registry.adoc b/microshift_install_get_ready/microshift-deploy-with-mirror-registry.adoc index 34716cd270..4f3fcb6efe 100644 --- a/microshift_install_get_ready/microshift-deploy-with-mirror-registry.adoc +++ b/microshift_install_get_ready/microshift-deploy-with-mirror-registry.adoc @@ -24,6 +24,6 @@ include::modules/microshift-configuring-hosts-for-mirror.adoc[leveloffset=+1] [role="_additional-resources"] == Additional resources -* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html/disconnected_environments/mirroring-in-disconnected-environments#installing-mirroring-creating-registry[Creating a mirror registry with mirror registry for Red Hat OpenShift] +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/disconnected_environments/index#installing-mirroring-creating-registry[Creating a mirror registry with mirror registry for Red Hat OpenShift] -* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html/disconnected_environments/mirroring-in-disconnected-environments#installation-adding-registry-pull-secret_about-installing-oc-mirror-v2[Configuring credentials that allow images to be mirrored] \ No newline at end of file +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/disconnected_environments/index#installation-adding-registry-pull-secret_about-installing-oc-mirror-v2[Configuring credentials that allow images to be mirrored] \ No newline at end of file diff --git a/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc b/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc index be5c7f8fa3..780ab51a2f 100644 --- a/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc +++ b/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc @@ -14,7 +14,7 @@ include::modules/microshift-olm-deploy-op-disconnected-con.adoc[leveloffset=+1] //additional resources for embedding operators into rhel for edge disconnected [role="_additional-resources"] .Additional resources -* link:https://access.redhat.com/documentation/en-us/red_hat_build_of_microshift/{ocp-version}/html/installing/microshift-embed-in-rpm-ostree-for-offline-use#microshift-creating-ostree-iso_microshift-embed-rpm-ostree-offline-use[Creating the RHEL for Edge image] +* link:https://access.redhat.com/documentation/en-us/red_hat_build_of_microshift/{ocp-version}/html/embedding_in_a_rhel_for_edge_image/microshift-embed-in-rpm-ostree#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Creating the RHEL for Edge image] * xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc#microshift-embed-rpm-ostree-offline-use[Embedding in a {op-system-ostree} image for offline use] * xref:../../microshift_networking/microshift-disconnected-network-config.adoc#microshift-networking-disconnected-hosts[Configuring network settings for fully disconnected hosts] diff --git a/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc b/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc index 2717a576fd..410cc8ff35 100644 --- a/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc +++ b/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc @@ -35,12 +35,12 @@ include::modules/microshift-oc-mirror-install-catalog-node.adoc[leveloffset=+1] [role="_additional-resources"] == Additional resources -* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/disconnected_environments/mirroring-in-disconnected-environments#installation-oc-mirror-installing-plugin_about-installing-oc-mirror-v2[Installing the oc mirror plugin] -* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/disconnected_environments/mirroring-in-disconnected-environments#oc-mirror-migration-v1-to-v2[Migrating from oc-mirror plugin v1 to v2] -* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/disconnected_environments/mirroring-in-disconnected-environments#oc-mirror-custom-resources-v2_about-installing-oc-mirror-v2[About custom resources generated by oc-mirror plugin v2] -* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/disconnected_environments/mirroring-in-disconnected-environments#oc-mirror-about-cache-and-workspace-dirs_about-installing-oc-mirror-v2[About the --cache-dir and --workspace flags] -* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/operators/administrator-tasks#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] -* link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.20/html/disconnected_environments/mirroring-in-disconnected-environments#oc-mirror-procedure-delete-v2_about-installing-oc-mirror-v2[Deleting images from a disconnected environment] +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/disconnected_environments/index#installing-mirroring-installation-images[Mirroring images for a disconnected installation by using the oc adm command] +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/disconnected_environments/index#oc-mirror-migration-v1-to-v2[Migrating from oc-mirror plugin v1 to v2] +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/disconnected_environments/index#oc-mirror-custom-resources-v2_about-installing-oc-mirror-v2[About custom resources generated by oc-mirror plugin v2] +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/disconnected_environments/index#oc-mirror-about-cache-and-workspace-dirs_about-installing-oc-mirror-v2[About the --cache-dir and --workspace flags] +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html-single/disconnected_environments/index#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments] +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.20/html-single/disconnected_environments/index#oc-mirror-procedure-delete-v2_about-installing-oc-mirror-v2[Deleting images from a disconnected environment] {microshift-short} links:: * xref:../../microshift_install_get_ready/microshift-deploy-with-mirror-registry.adoc#microshift-configuring-hosts-for-mirror_microshift-deployment-mirror[Configuring hosts for mirror registry access] diff --git a/microshift_running_apps/microshift_operators/microshift-operators-olm.adoc b/microshift_running_apps/microshift_operators/microshift-operators-olm.adoc index c9362c6d22..920a07dd51 100644 --- a/microshift_running_apps/microshift_operators/microshift-operators-olm.adoc +++ b/microshift_running_apps/microshift_operators/microshift-operators-olm.adoc @@ -18,7 +18,7 @@ Operator Lifecycle Manager (OLM) is used in {microshift-short} for installing an ** Each catalog must have an accessible `CatalogSource` added to a node, so that the OLM catalog Operator can use the catalog for content. * You must use the CLI to conduct OLM activities with {microshift-short}. The console and OperatorHub GUIs are not available. ** Use the link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli#cli-opm-install[Operator Package Manager `opm` CLI] with a network-connected node, or for building catalogs for custom Operators that use an internal registry. -** To mirror your catalogs and Operators for disconnected or offline nodes, install link:https://docs.openshift.com/container-platform/{ocp-version}/installing/disconnected_install/installing-mirroring-disconnected.html#installation-oc-mirror-installing-plugin_installing-mirroring-disconnected[the oc-mirror OpenShift CLI plugin]. +** To mirror your catalogs and Operators for disconnected or offline nodes, install link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/disconnected_environments/index#installation-oc-mirror-installing-plugin_about-installing-oc-mirror-v2. [IMPORTANT] ==== @@ -42,7 +42,7 @@ include::modules/microshift-olm-build-op-catalogs.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources * link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli[`opm` CLI reference] -* link:https://docs.openshift.com/container-platform/{ocp-version}/operators/understanding/olm-rh-catalogs.html#olm-about-catalogs_olm-rh-catalogs[About Operator catalogs] +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/operators/index#olm-about-catalogs_olm-rh-catalogs[About Operator catalogs] * To create file-based catalogs by using the `opm` CLI, see link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/operators/administrator-tasks#olm-managing-custom-catalogs[Managing custom catalogs] include::modules/microshift-olm-deploy-ops-con.adoc[leveloffset=+1] @@ -50,7 +50,7 @@ include::modules/microshift-olm-deploy-ops-con.adoc[leveloffset=+1] //additional resources for deploying operators concept module [role="_additional-resources"] .Additional resources -* link:https://docs.openshift.com/container-platform/{ocp-version}/operators/understanding/olm/olm-understanding-operatorgroups.html#olm-operatorgroups-membership_olm-understanding-operatorgroups[Operator group membership] +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/operators/index#olm-operatorgroups-membership_olm-understanding-operatorgroups[Operator group membership] include::modules/microshift-olm-deploy-ops-global-ns.adoc[leveloffset=+2] diff --git a/modules/microshift-oc-mirror-creating-imageset-config.adoc b/modules/microshift-oc-mirror-creating-imageset-config.adoc index fc25dc8a5b..1e508a9820 100644 --- a/modules/microshift-oc-mirror-creating-imageset-config.adoc +++ b/modules/microshift-oc-mirror-creating-imageset-config.adoc @@ -17,7 +17,7 @@ oc mirror v2 uses a cache system instead of metadata. The cache system prevents * You created a container image registry credentials file. For more information, see the following reference: -** link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/disconnected_environments/mirroring-in-disconnected-environments#installation-adding-registry-pull-secret_installing-mirroring-disconnected[Configuring credentials that allow images to be mirrored] +** link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html-single/disconnected_environments/index#installation-adding-registry-pull-secret_installing-mirroring-disconnected[Configuring credentials that allow images to be mirrored] .Procedure diff --git a/modules/microshift-olm-build-op-catalogs.adoc b/modules/microshift-olm-build-op-catalogs.adoc index fec4d4be91..e03c8665f5 100644 --- a/modules/microshift-olm-build-op-catalogs.adoc +++ b/modules/microshift-olm-build-op-catalogs.adoc @@ -12,9 +12,10 @@ To use Operator Lifecycle Manager (OLM) with {microshift-short}, you must build == File-based Operator catalogs You can create catalogs for your custom Operators or filter catalogs of widely available Operators. You can combine both methods to create the catalogs needed for your specific use case. To run {microshift-short} with your own Operators and OLM, make a catalog by using the file-based catalog structure. -* For details, see link:https://docs.openshift.com/container-platform/4.14/operators/admin/olm-managing-custom-catalogs.html#olm-creating-fb-catalog-image_olm-managing-custom-catalogs[Managing custom catalogs] and link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/operators/understanding-operators#olm-fb-catalogs-example_olm-packaging-format[Example catalog]. +* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/operators/index#olm-managing-custom-catalogs[Managing custom catalogs] +* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/operators/understanding-operators#olm-fb-catalogs-example_olm-packaging-format[Example catalog] -* See also link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli[`opm` CLI reference]. +* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli[`opm` CLI reference] [IMPORTANT] ====