From bbab257960f9814b14aca59ec48a23afb6c679ec Mon Sep 17 00:00:00 2001
From: Alex Dellapenta <adellape@redhat.com>
Date: Thu, 22 Jun 2023 12:59:40 -0600
Subject: [PATCH] Update OLM global namespace next steps

---
 logging/v5_5/{attributes => _attributes}               | 0
 logging/v5_6/{attributes => _attributes}               | 0
 logging/v5_7/{attributes => _attributes}               | 0
 modules/olm-installing-from-operatorhub-using-cli.adoc | 6 +++++-
 operators/admin/olm-adding-operators-to-cluster.adoc   | 3 ++-
 5 files changed, 7 insertions(+), 2 deletions(-)
 rename logging/v5_5/{attributes => _attributes} (100%)
 rename logging/v5_6/{attributes => _attributes} (100%)
 rename logging/v5_7/{attributes => _attributes} (100%)

diff --git a/logging/v5_5/attributes b/logging/v5_5/_attributes
similarity index 100%
rename from logging/v5_5/attributes
rename to logging/v5_5/_attributes
diff --git a/logging/v5_6/attributes b/logging/v5_6/_attributes
similarity index 100%
rename from logging/v5_6/attributes
rename to logging/v5_6/_attributes
diff --git a/logging/v5_7/attributes b/logging/v5_7/_attributes
similarity index 100%
rename from logging/v5_7/attributes
rename to logging/v5_7/_attributes
diff --git a/modules/olm-installing-from-operatorhub-using-cli.adoc b/modules/olm-installing-from-operatorhub-using-cli.adoc
index 8c21ef0a72..e47f7d593f 100644
--- a/modules/olm-installing-from-operatorhub-using-cli.adoc
+++ b/modules/olm-installing-from-operatorhub-using-cli.adoc
@@ -142,7 +142,7 @@ spec:
     nodeSelector: <12>
       foo: bar
 ----
-<1> For `AllNamespaces` install mode usage, specify the `openshift-operators` namespace. Otherwise, specify the relevant single namespace for `SingleNamespace` install mode usage.
+<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.
 <2> Name of the channel to subscribe to.
 <3> Name of the Operator to subscribe to.
 <4> Name of the catalog source that provides the Operator.
@@ -163,3 +163,7 @@ $ oc apply -f sub.yaml
 ----
 +
 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.
+
+ifeval::["{context}" == "olm-installing-operators-in-namespace"]
+:!olm-user:
+endif::[]
\ No newline at end of file
diff --git a/operators/admin/olm-adding-operators-to-cluster.adoc b/operators/admin/olm-adding-operators-to-cluster.adoc
index 7a51b27e12..2f9ca823a3 100644
--- a/operators/admin/olm-adding-operators-to-cluster.adoc
+++ b/operators/admin/olm-adding-operators-to-cluster.adoc
@@ -41,6 +41,7 @@ include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1]
 * xref:../../operators/understanding/olm/olm-understanding-operatorgroups.adoc#olm-operatorgroups-about_olm-understanding-operatorgroups[About Operator groups]
 
 include::modules/olm-installing-specific-version-cli.adoc[leveloffset=+1]
+
 [role="_additional-resources"]
 .Additional resources
 
@@ -65,7 +66,7 @@ After completing the Operator installation, the Operator resides in the tenant O
 include::modules/olm-installing-global-namespaces.adoc[leveloffset=+1]
 .Next steps
 
-* 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].
+* 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].
 +
 [NOTE]
 ====