Skip to content

Commit 67957b6

Browse files
committed
Revert "Merge pull request #44797 from adellape/fix_dotcallout"
This reverts commit 13adda3, reversing changes made to 22cf0b8.
1 parent 31181d3 commit 67957b6

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

modules/olm-catalogsource.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Cluster administrators can view the full list of Operators provided by an enable
2222
The `spec` of a `CatalogSource` object indicates how to construct a pod or how to communicate with a service that serves the Operator Registry gRPC API.
2323

2424
.Example `CatalogSource` object
25+
[%collapsible]
26+
====
2527
[source,yaml,subs="attributes+"]
2628
----
2729
apiVersion: operators.coreos.com/v1alpha1
@@ -82,6 +84,7 @@ Set the `olm.catalogImageTemplate` annotation to your index image name and use o
8284
See link:https://grpc.github.io/grpc/core/md_doc_connectivity-semantics-and-api.html[States of Connectivity] in the gRPC documentation for more details.
8385
<.> Latest time the container registry storing the catalog image was polled to ensure the image is up-to-date.
8486
<.> Status information for the catalog's Operator Registry service.
87+
====
8588

8689
Referencing the `name` of a `CatalogSource` object in a subscription instructs OLM where to search to find a requested Operator:
8790

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ The Dockerfile must be in the same parent directory as the catalog directory tha
6767
+
6868
[source,terminal]
6969
----
70-
$ opm init <operator_name> \// <.>
71-
--default-channel=preview \// <.>
72-
--description=./README.md \// <.>
73-
--icon=./operator-icon.svg \// <.>
74-
--output yaml \// <.>
70+
$ opm init <operator_name> \ <.>
71+
--default-channel=preview \ <.>
72+
--description=./README.md \ <.>
73+
--icon=./operator-icon.svg \ <.>
74+
--output yaml \ <.>
7575
> <operator_name>-index/index.yaml <.>
7676
----
7777
<.> Operator, or package, name.
@@ -87,7 +87,7 @@ This command generates an `olm.package` declarative config blob in the specified
8787
+
8888
[source,terminal]
8989
----
90-
$ opm render <registry>/<namespace>/<bundle_image_name>:<tag> \// <.>
90+
$ opm render <registry>/<namespace>/<bundle_image_name>:<tag> \ <.>
9191
--output=yaml \
9292
>> <operator_name>-index/index.yaml <.>
9393
----

modules/olm-mirroring-catalog-airgapped.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ If your mirror registry is on a completely disconnected, or airgapped, host, tak
2222
[source,terminal]
2323
----
2424
$ oc adm catalog mirror \
25-
<index_image> \// <.>
26-
file:///local/index \// <.>
27-
-a ${REG_CREDS} \// <.>
28-
--insecure \// <.>
25+
<index_image> \ <.>
26+
file:///local/index \ <.>
27+
-a ${REG_CREDS} \ <.>
28+
--insecure \ <.>
2929
--index-filter-by-os='<platform>/<arch>' <.>
3030
----
3131
<.> 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}`.
@@ -66,10 +66,10 @@ $ podman login <mirror_registry>
6666
[source,terminal]
6767
----
6868
$ oc adm catalog mirror \
69-
file://local/index/<repo>/<index_image>:<tag> \// <.>
70-
<mirror_registry>:<port>/<namespace> \// <.>
71-
-a ${REG_CREDS} \// <.>
72-
--insecure \// <.>
69+
file://local/index/<repo>/<index_image>:<tag> \ <.>
70+
<mirror_registry>:<port>/<namespace> \ <.>
71+
-a ${REG_CREDS} \ <.>
72+
--insecure \ <.>
7373
--index-filter-by-os='<platform>/<arch>' <.>
7474
----
7575
<.> Specify the `file://` path from the previous command output.

modules/olm-mirroring-catalog-colocated.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ $ podman login <mirror_registry>
3131
[source,terminal]
3232
----
3333
$ oc adm catalog mirror \
34-
<index_image> \// <.>
35-
<mirror_registry>:<port>/<namespace> \// <.>
36-
[-a ${REG_CREDS}] \// <.>
37-
[--insecure] \// <.>
38-
[--index-filter-by-os='<platform>/<arch>'] \// <.>
34+
<index_image> \ <.>
35+
<mirror_registry>:<port>/<namespace> \ <.>
36+
[-a ${REG_CREDS}] \ <.>
37+
[--insecure] \ <.>
38+
[--index-filter-by-os='<platform>/<arch>'] \ <.>
3939
[--manifests-only] <.>
4040
----
4141
<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}`.

0 commit comments

Comments
 (0)