Skip to content

Commit 4d2a1ad

Browse files
committed
Rm opm index prune from disconnected install
1 parent b887b06 commit 4d2a1ad

File tree

5 files changed

+4
-9
lines changed

5 files changed

+4
-9
lines changed

installing/disconnected_install/installing-mirroring-installation-images.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ Mirroring Operator catalogs for use with disconnected clusters has the following
9494

9595
* Workstation with unrestricted network access.
9696
* `podman` version 1.9.3 or later.
97-
* If you want to filter, or _prune_, the default catalog and selectively mirror only a subset of Operators, see the following sections:
98-
** xref:../../cli_reference/opm/cli-opm-install.adoc#cli-opm-install[Installing the opm CLI]
99-
** xref:../../operators/admin/olm-restricted-networks.adoc#olm-pruning-index-image_olm-restricted-networks[Filtering a SQLite-based index image]
10097
ifndef::openshift-origin[]
10198
* If you want to mirror a Red Hat-provided catalog, run the following command on your workstation with unrestricted network access to authenticate with `registry.redhat.io`:
10299
+

modules/connected-to-disconnected-mirror-images.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ $ oc adm catalog mirror <index_image> <mirror_registry>:<port>/<namespace> -a <r
4343
--
4444
where:
4545

46-
`index_image`:: Specifies the index image for the catalog you want to mirror. For example, this might be a pruned index image that you created previously, or one of the source index images for the default catalogs, such as `{index-image-pullspec}`.
46+
`index_image`:: Specifies the index image for the catalog that you want to mirror.
4747
`mirror_registry`:: Specifies the FQDN for the target registry and namespace to mirror the Operator content to, where `<namespace>` is any existing namespace on the registry.
4848
`reg_creds`:: Optional: Specifies the location of your registry credentials file, if required.
4949
--

modules/olm-mirroring-catalog-airgapped.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ $ oc adm catalog mirror \
2828
--insecure \ <4>
2929
--index-filter-by-os='<platform>/<arch>' <5>
3030
----
31-
<1> Specify the index image for the catalog that you want to mirror. For example, this might be a pruned index image that you created previously, or one of the source index images for the default catalogs, such as `{index-image-pullspec}`.
31+
<1> Specify the index image for the catalog that you want to mirror.
3232
<2> Specify the content to mirror to local files in your current directory.
3333
<3> Optional: If required, specify the location of your registry credentials file.
3434
<4> Optional: If you do not want to configure trust for the target registry, add the `--insecure` flag.

modules/olm-mirroring-catalog-colocated.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ $ oc adm catalog mirror \
3838
[--index-filter-by-os='<platform>/<arch>'] \ <5>
3939
[--manifests-only] <6>
4040
----
41-
<1> Specify the index image for the catalog that you want to mirror. For example, this might be a pruned index image that you created previously, or one of the source index images for the default catalogs, such as `{index-image-pullspec}`.
41+
<1> Specify the index image for the catalog that you want to mirror.
4242
<2> Specify the fully qualified domain name (FQDN) for the target registry and namespace to mirror the Operator contents to, where `<namespace>` is any existing namespace on the registry. For example, you might create an `olm-mirror` namespace to push all mirrored content to.
4343
<3> Optional: If required, specify the location of your registry credentials file.
4444
`{REG_CREDS}` is required for `registry.redhat.io`.
4545
<4> Optional: If you do not want to configure trust for the target registry, add the `--insecure` flag.
4646
<5> Optional: Specify which platform and architecture of the index image to select when multiple variants are available. Images are passed as `'<platform>/<arch>[/<variant>]'`. This does not apply to images referenced by the index. Valid values are `linux/amd64`, `linux/ppc64le`, `linux/s390x`, `linux/arm64`.
47-
<6> Optional: Generate only the manifests required for mirroring without actually mirroring the image content to a registry. This option can be useful for reviewing what will be mirrored, and lets you make any changes to the mapping list, if you require only a subset of packages. You can then use the `mapping.txt` file with the `oc image mirror` command to mirror the modified list of images in a later step. This flag is intended for only advanced selective mirroring of content from the catalog; the `opm index prune` command, if you used it previously to prune the index image, is suitable for most catalog management use cases.
47+
<6> Optional: Generate only the manifests required for mirroring without actually mirroring the image content to a registry. This option can be useful for reviewing what will be mirrored, and lets you make any changes to the mapping list, if you require only a subset of packages. You can then use the `mapping.txt` file with the `oc image mirror` command to mirror the modified list of images in a later step. This flag is intended for only advanced selective mirroring of content from the catalog.
4848
+
4949
.Example output
5050
[source,terminal,subs="attributes+"]

operators/admin/olm-restricted-networks.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,13 @@ Infrastructure features:: Disconnected
4545
== Prerequisites
4646

4747
* Log in to your {product-title} cluster as a user with `cluster-admin` privileges.
48-
* If you want to prune the default catalog and selectively mirror only a subset of Operators, install the xref:../../cli_reference/opm/cli-opm-install.adoc#cli-opm-install[`opm` CLI].
4948

5049
[NOTE]
5150
====
5251
If you are using OLM in a restricted network on {ibmzProductName}, you must have at least 12 GB allocated to the directory where you place your registry.
5352
====
5453

5554
include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1]
56-
include::modules/olm-pruning-index-image.adoc[leveloffset=+1]
5755

5856
[id="olm-mirror-catalog_olm-restricted-networks"]
5957
== Mirroring an Operator catalog

0 commit comments

Comments
 (0)