Skip to content

Commit eb46d36

Browse files
committed
RHIDP-5494: Apply reviewer comments
1 parent 1645770 commit eb46d36

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

modules/installation/proc-install-rhdh-airgapped-environment-ocp-operator.adoc

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ On an {ocp-short} cluster operating on a restricted network, public resources ar
1616

1717
To make these resources available, replace them with their equivalent resources in a mirror registry accessible to your cluster.
1818

19-
You can use a helper script that mirrors the necessary images and provides the necessary configuration to ensure those images will be used when installing the {product} Operator and creating {product-short} instances. This script requires a target mirror registry. You likely have a target mirror registry ready to use if your cluster is already operating on a disconnected network. If you do not already have a target registry, and if you have an {ocp-short} cluster, you might want to expose and leverage the internal cluster registry.
19+
You can use a helper script that mirrors the necessary images and provides the necessary configuration to ensure those images are used when installing the {product} Operator and creating {product-short} instances. This script requires a target mirror registry. You likely have a target mirror registry if your cluster is already operating on a disconnected network. If you do not already have a target registry, and if you have an {ocp-short} cluster, you might want to expose and leverage the internal cluster registry.
2020

21-
If you are connected to a {ocp-short} cluster, the helper script will detect it and will automatically expose the cluster registry. However, if you are connected to a Kubernetes cluster, you can manually specify the target registry that you want to mirror the images to.
21+
When connected to a {ocp-short} cluster, the helper script detects it and automatically exposes the cluster registry. If connected to a Kubernetes cluster, you can manually specify the target registry to mirror the images.
2222

2323
.Prerequisites
2424
* You have installed Podman 5.3 or later. For more information, see link:https://podman.io/docs/installation[Podman Installation Instructions].
2525
* You have installed Skopeo 1.17 or later.
26-
* You have installed yq 4.44 or later.
27-
* You have installed the GNU sed command line text editor.
28-
* You have installed umoci CLI tool.
26+
* You have installed `yq` 4.44 or later.
27+
* You have installed the GNU `sed` command line text editor.
28+
* You have installed `umoci` CLI tool.
2929
* You have an active `oc registry`, `podman`, or `skopeo` session to the `registry.redhat.io` {company-name} Ecosystem Catalog. For more information, see link:https://access.redhat.com/RegistryAuthentication[{company-name} Container Registry Authentication].
3030
* You have an active `skopeo` session with administrative access to the target mirror registry. For more information, see link:https://github.com/containers/skopeo#authenticating-to-a-registry[Authenticating to a registry].
3131
* You have installed the `opm` CLI tool. For more information, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.17/html/cli_tools/opm-cli#olm-about-opm_cli-opm-install[Installing the opm CLI].
@@ -44,7 +44,7 @@ If you are connected to a {ocp-short} cluster, the helper script will detect it
4444
curl -sSLO https://raw.githubusercontent.com/redhat-developer/rhdh-operator/refs/heads/release-{product-version}/.rhdh/scripts/prepare-restricted-environment.sh
4545
----
4646
+
47-
. Run the mirroring script by running the `bash` command with the appropriate set of options:
47+
. Run the mirroring script by using the `bash` command with the appropriate set of options:
4848
+
4949
[source,terminal,subs="+quotes,+attributes"]
5050
----
@@ -86,13 +86,11 @@ If your network has access to the registry through a bastion host, you can use t
8686

8787
* You have installed Podman 5.3 or later. For more information, see link:https://podman.io/docs/installation[Podman Installation Instructions].
8888
* You have installed Skopeo 1.17 or later.
89-
* You have installed yq 4.44 or later.
90-
* You have installed the GNU sed command line text editor.
91-
* You have installed umoci CLI tool.
89+
* You have installed `yq` 4.44 or later.
90+
* You have installed the GNU `sed` command line text editor.
91+
* You have installed `umoci` CLI tool.
9292
* You have an active `oc registry`, `podman`, or `skopeo` session to the `registry.redhat.io` {company-name} Ecosystem Catalog. For more information, see link:https://access.redhat.com/RegistryAuthentication[{company-name} Container Registry Authentication].
93-
* You have an active `oc registry` session to the `registry.redhat.io` {company-name} Ecosystem Catalog. For more information, see link:https://access.redhat.com/RegistryAuthentication[{company-name} Container Registry Authentication].
9493
* You have installed the `opm` CLI tool. For more information, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.17/html/cli_tools/opm-cli#olm-about-opm_cli-opm-install[Installing the opm CLI].
95-
* You have installed Podman 5.3 or later. For more information, see link:https://podman.io/docs/installation[Podman Installation Instructions].
9694

9795
.Procedure
9896
. Download the mirroring script to disk by running the following command:
@@ -102,12 +100,12 @@ If your network has access to the registry through a bastion host, you can use t
102100
curl -sSLO https://raw.githubusercontent.com/redhat-developer/rhdh-operator/refs/heads/release-{product-version}/.rhdh/scripts/prepare-restricted-environment.sh
103101
----
104102
+
105-
. Run the mirroring script by running the `bash` command with the appropriate set of options:
103+
. Run the mirroring script by using the `bash` command with the appropriate set of options:
106104
+
107-
[source,terminal,subs="+quotes,+attributes"]
105+
[source,terminal,subs="attributes+"]
108106
----
109-
bash prepare-restricted-environment.sh \
110-
--filter-versions "{product-version}" \
107+
bash prepare-restricted-environment.sh
108+
--filter-versions "{product-version}"
111109
--to-dir _<my_pulled_image_location>_ <1>
112110
[--use-oc-mirror true] <2>
113111
----
@@ -120,21 +118,21 @@ The script can take several minutes to complete as it copies multiple images to
120118
====
121119
+
122120
. Transfer the directory specified by the `--to-dir` option to your disconnected environment.
123-
. From a machine in your disconnected environment that has access to both the cluster and the target mirror registry, run the mirroring script by running the `bash` command with the appropriate set of options:
121+
. From a machine in your disconnected environment that has access to both the cluster and the target mirror registry, run the mirroring script by using the `bash` command with the appropriate set of options:
124122
+
125123
[source,terminal,subs="+quotes,+attributes"]
126124
----
127-
bash _<my_pulled_image_location>_/install.sh \ <1>
128-
--from-dir _<my_pulled_image_location>_ \ <2>
129-
[--to-registry _<my.registry.example.com>_] \ <3>
125+
bash _<my_pulled_image_location>_/install.sh <1>
126+
--from-dir _<my_pulled_image_location>_ <2>
127+
[--to-registry _<my.registry.example.com>_] <3>
130128
[--use-oc-mirror true] <4>
131129
----
132130
<1> The downloaded image and the absolute path to the directory where it is stored on your system.
133131
<2> Specifies the directory where you want to pull all of the necessary images with the `--to-dir` option.
134132
<3> Specifies the URL for the target mirror registry where you want to mirror the images.
135133
<4> (Optional) Uses the `oc-mirror` {ocp-short} CLI plugin to mirror images.
136134
+
137-
[NOTE]
135+
[IMPORTANT]
138136
====
139137
If you used `oc-mirror` to mirror the images to disk, you must also use `oc-mirror` to mirror the images from disk due to the folder layout that `oc-mirror` uses.
140138
====

0 commit comments

Comments
 (0)