Clean up the STF install (#505)

* Clean up the STF install for OCP 4.12 and later Clean up the STF installation documentation along with a command that will wait for the STO CSV to be ready and then automatically show the dependencies. Also hide contents that are no longer applicable when the supported base version of OCP is greater than 4.10, since OCP 4.10 is now EOL. * Adjust the ifeval to be < 4.12
infrawatch · Oct 24, 2023 · f94a996 · f94a996
1 parent 3802f4a
commit f94a996
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/...emetry-Framework/assemblies/assembly_installing-the-core-components-of-stf.adoc b/...emetry-Framework/assemblies/assembly_installing-the-core-components-of-stf.adoc
@@ -44,7 +44,10 @@ endif::[]
 include::../modules/con_deploying-stf-to-the-openshift-environment.adoc[leveloffset=+1]
 
 include::../modules/proc_deploying-observability-operator.adoc[leveloffset=+2]
+
+ifeval::[{SupportedOpenShiftVersion} < 4.12]
 include::../modules/proc_deploying-certificate-manager-for-openshift-operator.adoc[leveloffset=+2]
+endif::[]
 include::../modules/proc_deploying-service-telemetry-operator.adoc[leveloffset=+2]
 
 

diff --git a/doc-Service-Telemetry-Framework/modules/proc_deploying-observability-operator.adoc b/doc-Service-Telemetry-Framework/modules/proc_deploying-observability-operator.adoc
@@ -41,5 +41,5 @@ EOF
 ----
 $ oc wait --for jsonpath="{.status.phase}"=Succeeded csv --namespace=openshift-operators -l operators.coreos.com/observability-operator.openshift-operators
 
-clusterserviceversion.operators.coreos.com/observability-operator.v0.0.26-230906073415 condition met
+clusterserviceversion.operators.coreos.com/observability-operator.v0.0.25 condition met
 ----
diff --git a/...vice-Telemetry-Framework/modules/proc_deploying-service-telemetry-operator.adoc b/...vice-Telemetry-Framework/modules/proc_deploying-service-telemetry-operator.adoc
@@ -9,7 +9,9 @@ Deploy Service Telemetry Operator on {OpenShift} to provide the supporting Opera
 .Prerequisites
 
 * Installation of Observability Operator which uses Prometheus to store metrics. For more information, see xref:deploying-observability-operator_assembly-installing-the-core-components-of-stf[].
+ifeval::[{SupportedOpenShiftVersion} < 4.12]
 * Installation of Certificate Manager for OpenShift on {OpenShift} versions prior to 4.12. For more information, see xref:deploying-certificate-manager-for-openshift-operator_assembly-installing-the-core-components-of-stf[]
+endif::[]
 
 .Procedure
 
@@ -126,16 +128,18 @@ EOF
 ----
 endif::[]
 
-. Validate the Service Telemetry Operator and the dependent operators have their phase as Succeeded. You may need to re-run the command several times until all Operators are available:
+. Validate the Service Telemetry Operator and the dependent operators have their phase as Succeeded:
 +
 [source,bash,options="nowrap",role="white-space-pre"]
 ----
-$ oc get csv --namespace service-telemetry
+$ oc wait --for jsonpath="{.status.phase}"=Succeeded csv --namespace=service-telemetry -l operators.coreos.com/service-telemetry-operator.service-telemetry ; oc get csv --namespace service-telemetry
+
+clusterserviceversion.operators.coreos.com/service-telemetry-operator.v1.5.1698100836 condition met
 
 NAME                                         DISPLAY                                       VERSION          REPLACES                             PHASE
-amq7-interconnect-operator.v1.10.16          Red Hat Integration - AMQ Interconnect        1.10.16          amq7-interconnect-operator.v1.10.4   Succeeded
-cert-manager-operator.v1.11.4                cert-manager Operator for Red Hat OpenShift   1.11.4                                                Succeeded
+amq7-interconnect-operator.v1.10.17          Red Hat Integration - AMQ Interconnect        1.10.17          amq7-interconnect-operator.v1.10.4   Succeeded
+cert-manager-operator.v1.12.0                cert-manager Operator for Red Hat OpenShift   1.12.0           cert-manager-operator.v1.11.4        Succeeded
 observability-operator.v0.0.25               Observability Operator                        0.0.25           observability-operator.v0.0.22       Succeeded
-service-telemetry-operator.v1.5.1691275411   Service Telemetry Operator                    1.5.1691275411                                        Succeeded
-smart-gateway-operator.v5.0.1691275406       Smart Gateway Operator                        5.0.1691275406                                        Succeeded
+service-telemetry-operator.v1.5.1698100836   Service Telemetry Operator                    1.5.1698100836                                        Succeeded
+smart-gateway-operator.v5.0.1698100831       Smart Gateway Operator                        5.0.1698100831                                        Succeeded
 ----