Merge pull request openshift#15256 from mburke5678/logging-install-fi…

…x-eo

Fix the Elasticsearch Opetrator install based on slack

modules/efk-logging-deploy-subscription.adoc

@@ -23,7 +23,7 @@ You can install the Cluster Logging Operator using the web console or CLI.
 
 Ensure that you have the necessary persistent storage for Elasticsearch. Note that each Elasticsearch node
 requires its own storage volume.
-+
+
 Elasticsearch is a memory-intensive application. Each Elasticsearch node needs 16G of memory for both memory requests and CPU limits.
 The initial set of {product-title} nodes might not be large enough to support the Elasticsearch cluster. You must add additional nodes to the
 {product-title} cluster to run with the recommended or higher memory. Each Elasticsearch node can operate with a lower
@@ -35,12 +35,17 @@ You *must* install the Elasticsearch Operator using the CLI following the direct
 You can install the Cluster Logging Operator using the web console or CLI.
 ====
 
-
 .Procedure
 
-. Install the Elasticsearch Operator using the CLI to ensure the necessary values are set:
+. Create Namespaces for the Elasticsearch Operator and Cluster Logging Operator.
++
+[NOTE]
+====
+You can also create the Namespaces in the web console using the *Administration* -> *Namespaces* page.
+You must apply the `cluster-logging` and `cluster-monitoring` labels listed in the sample YAML to the namespaces you create.
+====
 
-.. Create a Namespace for the Elasticsearch operator (for example, `eo-project.yaml`):
+.. Create a Namespace for the Elasticsearch Operator (for example, `eo-namespace.yaml`):
 +
 ----
 apiVersion: v1
@@ -55,11 +60,48 @@ metadata:
 ----
 <1> You must specify the `openshift-operators-redhat` namespace.
 
-.. Create the Namespace object:
+.. Run the following command to create the namespace:
++
+----
+$ oc create -f <file-name>.yaml
+----
++
+For example:
++
+----
+$ oc create -f eo-namespace.yaml
+----
+
+.. Create a Namespace for the Cluster Logging Operator (for example, `clo-namespace.yaml`):
++
+[source,yaml]
+----
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-logging
+  annotations:
+    openshift.io/node-selector: "" <1>
+  labels:
+    openshift.io/cluster-logging: "true"
+    openshift.io/cluster-monitoring: "true"
+----
+<1> Optionally specify an empty node selector in order for the logging pods to spread
+evenly across your cluster. If you want the logging pods to run on specific nodes, you can specify a node selector value here.
+
+.. Run the following command to create the namespace:
 +
 ----
-$ oc create -f eo-project.yaml
+$ oc create -f <file-name>.yaml
+----
++
+For example:
++
 ----
+$ oc create -f clo-namespace.yaml
+----
+
+. Install the Elasticsearch Operator by creating the following objects:
 
 .. Create an Operator Group object YAML file (for example, `eo-og.yaml`) for the Elasticsearch operator:
 +
@@ -73,7 +115,7 @@ spec: {}
 ----
 <1> You must specify the `openshift-operators-redhat` namespace.
 
-.. Create the Operator Group object:
+.. Create an Operator Group object:
 +
 ----
 $ oc create -f eo-og.yaml
@@ -98,7 +140,7 @@ spec:
 The Operator generates a CatalogSource from your CatalogSourceConfig in the
 namespace specified in `targetNamespace`.
 
-.. Create the CatalogSourceConfig object:
+.. Create a CatalogSourceConfig object:
 +
 ----
 $ oc create -f eo-csc.yaml
@@ -155,6 +197,7 @@ Now using project "openshift-operators-redhat"
 
 .. Create a Role-based Access Control (RBAC) object file (for example, `eo-rbac.yaml`) to grant Prometheus permission to access the `openshift-operators-redhat` namespace:
 +
+[source,yaml]
 ----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -197,31 +240,7 @@ $ oc create -f eo-rbac.yaml
 The Elasticsearch operator is installed to each project in the cluster.
 
 
-. You can install the Cluster Logging Operator using the {product-title} web console for best results: 
-
-.. In the CLI, create a project for cluster logging. You must create the project with the CLI:
-+
-[source,yaml]
-----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: openshift-logging
-  annotations:
-    openshift.io/node-selector: "" <1>
-  labels:
-    openshift.io/cluster-logging: "true"
-    openshift.io/cluster-monitoring: "true"
-----
-<1> Optionally specify an empty node selector in order for the logging pods to spread
-evenly across your cluster. The logging pods will be spread evenly throughout the cluster.
-If you want the logging pods to run on specific nodes, you can specify a node selector value here.
-
-.. Run the following command to create the project:
-+
-----
-$ oc create -f <file-name>.yaml
-----
+. Install the Cluster Logging Operator using the {product-title} web console for best results: 
 
 .. In the {product-title} web console, click *Catalog* -> *OperatorHub*.
 
@@ -234,8 +253,10 @@ Then, click *Subscribe*.
 
 .. Switch to the *Catalog* → *Installed Operators* page.
 
-.. Ensure that *Cluster Logging* and *Elasticsearch Operator* are listed on
-the *InstallSucceeded* tab with a *Status* of *InstallSucceeded*. Change the project to *all projects* if necessary.
+.. Ensure that *Cluster Logging* is listed in the *openshift-logging* project with a *Status* of *InstallSucceeded*.
+
+.. Ensure that *Elasticsearch Operator* is listed in the *openshift-operator-redhat* project with a *Status* of *InstallSucceeded*. 
+The Elasticsearch Operator is copies to all other projects.
 +
 [NOTE]
 ====
@@ -245,8 +266,6 @@ you can safely ignore the *Failed* message.
 +
 If either operator does not appear as installed, to troubleshoot further:
 +
-* On the *Copied* tab of the *Installed Operators* page, if an operator show a *Status* of
-*Copied*, this indicates the installation is in process and is expected behavior.
 * Switch to the *Catalog* → *Operator Management* page and inspect
 the *Operator Subscriptions* and *Install Plans* tabs for any failure or errors
 under *Status*.
@@ -353,4 +372,4 @@ You should see several pods for cluster logging, Elasticsearch, Fluentd, and Kib
 * fluentd-zqgqx
 * kibana-7fb4fd4cc9-bvt4p
 +
-.. Switch to the *Workloads* -> *Pods* page.
+