Skip to content

Commit 415ea78

Browse files
authored
Merge pull request #61619 from adellape/global_cli
2 parents bb32c6f + 0a17c79 commit 415ea78

File tree

6 files changed

+8
-3
lines changed

6 files changed

+8
-3
lines changed

contributing_to_docs/doc_guidelines.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ For example, if you are creating the links in a directory that is two levels dee
227227
$ ln -s ../../images/ images
228228
$ ln -s ../../modules/ modules
229229
$ ln -s ../../snippets/ snippets
230-
$ ln -s ../../_attributes/ attributes
230+
$ ln -s ../../_attributes/ _attributes
231231
----
232232
+
233233
Be sure to adjust the number of levels to back up (`../`) depending on how deep your directory is.
File renamed without changes.
File renamed without changes.
File renamed without changes.

modules/olm-installing-from-operatorhub-using-cli.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ spec:
142142
nodeSelector: <12>
143143
foo: bar
144144
----
145-
<1> For `AllNamespaces` install mode usage, specify the `openshift-operators` namespace. Otherwise, specify the relevant single namespace for `SingleNamespace` install mode usage.
145+
<1> For default `AllNamespaces` install mode usage, specify the `openshift-operators` namespace. Alternatively, you can specify a custom global namespace, if you have created one. Otherwise, specify the relevant single namespace for `SingleNamespace` install mode usage.
146146
<2> Name of the channel to subscribe to.
147147
<3> Name of the Operator to subscribe to.
148148
<4> Name of the catalog source that provides the Operator.
@@ -163,3 +163,7 @@ $ oc apply -f sub.yaml
163163
----
164164
+
165165
At this point, OLM is now aware of the selected Operator. A cluster service version (CSV) for the Operator should appear in the target namespace, and APIs provided by the Operator should be available for creation.
166+
167+
ifeval::["{context}" == "olm-installing-operators-in-namespace"]
168+
:!olm-user:
169+
endif::[]

operators/admin/olm-adding-operators-to-cluster.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1]
4141
* xref:../../operators/understanding/olm/olm-understanding-operatorgroups.adoc#olm-operatorgroups-about_olm-understanding-operatorgroups[About Operator groups]
4242
4343
include::modules/olm-installing-specific-version-cli.adoc[leveloffset=+1]
44+
4445
[role="_additional-resources"]
4546
.Additional resources
4647
@@ -65,7 +66,7 @@ After completing the Operator installation, the Operator resides in the tenant O
6566
include::modules/olm-installing-global-namespaces.adoc[leveloffset=+1]
6667
.Next steps
6768
68-
* Install the desired Operator in the installation namespace. This task is more easily performed by using the OperatorHub in the web console instead of the CLI; for a detailed procedure, see xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console].
69+
* Install the desired Operator in your custom global namespace. Because the web console does not populate the *Installed Namespace* menu during Operator installation with custom global namespaces, this task can only be performed with the OpenShift CLI (`oc`). For a detailed procedure, see xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operator-from-operatorhub-using-cli_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the CLI].
6970
+
7071
[NOTE]
7172
====

0 commit comments

Comments
 (0)