Skip to content

Commit 53324f0

Browse files
authored
Merge pull request #101578 from dfitzmau/fix-disconnect-environment
OSDOCS-17250: fix-disconnect-environment: Fixed microshift links that point to oc-m…
2 parents 3a444fd + 0d3cda1 commit 53324f0

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

microshift_install_get_ready/microshift-deploy-with-mirror-registry.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ include::modules/microshift-configuring-hosts-for-mirror.adoc[leveloffset=+1]
2424
[role="_additional-resources"]
2525
== Additional resources
2626

27-
* 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]
27+
* 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]
2828

29-
* 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]
29+
* 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]

microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ include::modules/microshift-olm-deploy-op-disconnected-con.adoc[leveloffset=+1]
1414
//additional resources for embedding operators into rhel for edge disconnected
1515
[role="_additional-resources"]
1616
.Additional resources
17-
* 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]
17+
* 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]
1818
* 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]
1919
* xref:../../microshift_networking/microshift-disconnected-network-config.adoc#microshift-networking-disconnected-hosts[Configuring network settings for fully disconnected hosts]
2020

microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ include::modules/microshift-oc-mirror-install-catalog-node.adoc[leveloffset=+1]
3535
[role="_additional-resources"]
3636
== Additional resources
3737

38-
* 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]
39-
* 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]
40-
* 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]
41-
* 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]
42-
* 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]
43-
* 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]
38+
* 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]
39+
* 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]
40+
* 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]
41+
* 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]
42+
* 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]
43+
* 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]
4444

4545
{microshift-short} links::
4646
* 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]

microshift_running_apps/microshift_operators/microshift-operators-olm.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Operator Lifecycle Manager (OLM) is used in {microshift-short} for installing an
1818
** Each catalog must have an accessible `CatalogSource` added to a node, so that the OLM catalog Operator can use the catalog for content.
1919
* You must use the CLI to conduct OLM activities with {microshift-short}. The console and OperatorHub GUIs are not available.
2020
** 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.
21-
** 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].
21+
** 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.
2222

2323
[IMPORTANT]
2424
====
@@ -42,15 +42,15 @@ include::modules/microshift-olm-build-op-catalogs.adoc[leveloffset=+1]
4242
[role="_additional-resources"]
4343
.Additional resources
4444
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli[`opm` CLI reference]
45-
* link:https://docs.openshift.com/container-platform/{ocp-version}/operators/understanding/olm-rh-catalogs.html#olm-about-catalogs_olm-rh-catalogs[About Operator catalogs]
45+
* 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]
4646
* 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]
4747

4848
include::modules/microshift-olm-deploy-ops-con.adoc[leveloffset=+1]
4949

5050
//additional resources for deploying operators concept module
5151
[role="_additional-resources"]
5252
.Additional resources
53-
* 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]
53+
* 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]
5454

5555
include::modules/microshift-olm-deploy-ops-global-ns.adoc[leveloffset=+2]
5656

modules/microshift-oc-mirror-creating-imageset-config.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ oc mirror v2 uses a cache system instead of metadata. The cache system prevents
1717

1818
* You created a container image registry credentials file. For more information, see the following reference:
1919
20-
** 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]
20+
** 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]
2121

2222
.Procedure
2323

modules/microshift-olm-build-op-catalogs.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ To use Operator Lifecycle Manager (OLM) with {microshift-short}, you must build
1212
== File-based Operator catalogs
1313
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.
1414

15-
* 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].
15+
* link:https://docs.redhat.com/en/documentation/openshift_container_platform/{ocp-version}/html-single/operators/index#olm-managing-custom-catalogs[Managing custom catalogs]
16+
* 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]
1617

17-
* See also link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli[`opm` CLI reference].
18+
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/cli_tools/opm-cli[`opm` CLI reference]
1819

1920
[IMPORTANT]
2021
====

0 commit comments

Comments
 (0)