Skip to content

Commit 84413b9

Browse files
authored
Merge pull request #75868 from adellape/fix_callouts_maybe
Fix callout WARNINGS in OLM-related modules
2 parents b815f5c + 1f32193 commit 84413b9

4 files changed

+16
-0
lines changed

modules/olm-accessing-images-private-registries.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,15 @@ $ oc create secret generic <secret_name> \
189189

190190
.. Verify the name of the service account for the Operator by searching the tenant namespace:
191191
+
192+
--
192193
[source,terminal]
193194
----
194195
$ oc get sa -n <tenant_namespace> <1>
195196
----
196197
<1> If the Operator was installed in an individual namespace, search that namespace. If the Operator was installed for all namespaces, search the `openshift-operators` namespace.
198+
--
197199
+
200+
--
198201
.Example output
199202
[source,terminal]
200203
----
@@ -205,6 +208,7 @@ deployer 2 6m1s
205208
etcd-operator 2 5m18s <1>
206209
----
207210
<1> Service account for an installed etcd Operator.
211+
--
208212

209213
.. Link the secret to the service account for the Operator:
210214
+

modules/olm-creating-fb-catalog-image.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ $ mkdir <catalog_dir>
3434

3535
.. Generate a Dockerfile that can build a catalog image by running the `opm generate dockerfile` command:
3636
+
37+
--
3738
[source,terminal,subs="attributes+"]
3839
----
3940
ifdef::openshift-origin[]
@@ -47,9 +48,11 @@ endif::[]
4748
ifndef::openshift-origin[]
4849
<1> Specify the official Red Hat base image by using the `-i` flag, otherwise the Dockerfile uses the default upstream image.
4950
endif::[]
51+
--
5052
+
5153
The Dockerfile must be in the same parent directory as the catalog directory that you created in the previous step:
5254
+
55+
--
5356
.Example directory structure
5457
[source,terminal]
5558
----
@@ -60,6 +63,7 @@ The Dockerfile must be in the same parent directory as the catalog directory tha
6063
<1> Parent directory
6164
<2> Catalog directory
6265
<3> Dockerfile generated by the `opm generate dockerfile` command
66+
--
6367

6468
.. Populate the catalog with the package definition for your Operator by running the `opm init` command:
6569
+

modules/olm-mirroring-catalog-airgapped.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ If your mirror registry is on a completely disconnected, or airgapped, host, tak
1919

2020
. Run the following command on your workstation with unrestricted network access to mirror the content to local files:
2121
+
22+
--
2223
[source,terminal]
2324
----
2425
$ oc adm catalog mirror \
@@ -33,7 +34,9 @@ $ oc adm catalog mirror \
3334
<3> Optional: If required, specify the location of your registry credentials file.
3435
<4> Optional: If you do not want to configure trust for the target registry, add the `--insecure` flag.
3536
<5> Optional: Specify which platform and architecture of the index image to select when multiple variants are available. Images are specified 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`, and `.*`
37+
--
3638
+
39+
--
3740
.Example output
3841
[source,terminal]
3942
----
@@ -47,6 +50,7 @@ To upload local images to a registry, run:
4750
----
4851
<1> Record the manifests directory name that is generated. This directory is referenced in subsequent procedures.
4952
<2> Record the expanded `file://` path that is based on your provided index image. This path is referenced in a subsequent step.
53+
--
5054
+
5155
This command creates a `v2/` directory in your current directory.
5256

modules/olm-mirroring-catalog-colocated.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ $ podman login <mirror_registry>
2828

2929
. Run the following command to extract and mirror the content to the mirror registry:
3030
+
31+
--
3132
[source,terminal]
3233
----
3334
$ oc adm catalog mirror \
@@ -45,7 +46,9 @@ $ oc adm catalog mirror \
4546
<4> Optional: If you do not want to configure trust for the target registry, add the `--insecure` flag.
4647
<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`.
4748
<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.
49+
--
4850
+
51+
--
4952
.Example output
5053
[source,terminal,subs="attributes+"]
5154
----
@@ -62,6 +65,7 @@ wrote mirroring manifests to manifests-{index-image}-1614211642 <2>
6265
====
6366
Red Hat Quay does not support nested repositories. As a result, running the `oc adm catalog mirror` command will fail with a `401` unauthorized error. As a workaround, you can use the `--max-components=2` option when running the `oc adm catalog mirror` command to disable the creation of nested repositories. For more information on this workaround, see the link:https://access.redhat.com/solutions/5440741[Unauthorized error thrown while using catalog mirror command with Quay registry] Knowledgebase Solution.
6467
====
68+
--
6569

6670
:!index-image-pullspec:
6771
:!index-image:

0 commit comments

Comments
 (0)