From b7ef9b62d679cf5f5de27782928b986ab429fa9e Mon Sep 17 00:00:00 2001 From: Leif Madsen Date: Thu, 23 Nov 2023 11:42:30 -0500 Subject: [PATCH] Clean up the prerequisites lists (#514) The prerequisite lists were slightly wrong and have been adjusted for correctness. Minor update of output in the same area to match latest version of STF. --- ...-servicetelemetry-object-in-openshift.adoc | 5 +++-- ..._deploying-service-telemetry-operator.adoc | 19 ++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/doc-Service-Telemetry-Framework/modules/proc_creating-a-servicetelemetry-object-in-openshift.adoc b/doc-Service-Telemetry-Framework/modules/proc_creating-a-servicetelemetry-object-in-openshift.adoc index a03049e0..a9157e89 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_creating-a-servicetelemetry-object-in-openshift.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_creating-a-servicetelemetry-object-in-openshift.adoc @@ -6,8 +6,9 @@ Create a `ServiceTelemetry` object in {OpenShift} to result in the Service Telem .Prerequisites -. You have installed {ObservabilityOperator} to allow storage of metrics. For more information, see xref:deploying-observability-operator_assembly-installing-the-core-components-of-stf[]. -. You have installed cert-manager for Red Hat OpenShift to allow certificate management. For more information, see xref:deploying-certificate-manager-for-openshift-operator_assembly-installing-the-core-components-of-stf[]. +* You have deployed {ProjectShort} and the supporting operators. For more information, see xref:deploying-stf-to-the-openshift-environment_assembly-installing-the-core-components-of-stf[]. +* You have installed {ObservabilityOperator} to allow storage of metrics. For more information, see xref:deploying-observability-operator_assembly-installing-the-core-components-of-stf[]. +* You have installed cert-manager for Red Hat OpenShift to allow certificate management. For more information, see xref:deploying-certificate-manager-for-openshift-operator_assembly-installing-the-core-components-of-stf[]. .Procedure diff --git a/doc-Service-Telemetry-Framework/modules/proc_deploying-service-telemetry-operator.adoc b/doc-Service-Telemetry-Framework/modules/proc_deploying-service-telemetry-operator.adoc index d169ac5a..23a02549 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_deploying-service-telemetry-operator.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_deploying-service-telemetry-operator.adoc @@ -8,10 +8,8 @@ Deploy Service Telemetry Operator on {OpenShift} to provide the supporting Opera .Prerequisites -* Installation of {ObservabilityOperator} 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::[] +* You have installed {ObservabilityOperator} to allow storage of metrics. For more information, see xref:deploying-observability-operator_assembly-installing-the-core-components-of-stf[]. +* You have installed cert-manager for Red Hat OpenShift to allow certificate management. For more information, see xref:deploying-certificate-manager-for-openshift-operator_assembly-installing-the-core-components-of-stf[]. .Procedure @@ -134,12 +132,11 @@ endif::[] ---- $ 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 +clusterserviceversion.operators.coreos.com/service-telemetry-operator.v1.5.1700688542 condition met -NAME DISPLAY VERSION REPLACES PHASE -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.1698100836 Service Telemetry Operator 1.5.1698100836 Succeeded -smart-gateway-operator.v5.0.1698100831 Smart Gateway Operator 5.0.1698100831 Succeeded +NAME DISPLAY VERSION REPLACES PHASE +amq7-interconnect-operator.v1.10.17 Red Hat Integration - AMQ Interconnect 1.10.17 amq7-interconnect-operator.v1.10.4 Succeeded +observability-operator.v0.0.26 Cluster Observability Operator 0.1.0 Succeeded +service-telemetry-operator.v1.5.1700688542 Service Telemetry Operator 1.5.1700688542 Succeeded +smart-gateway-operator.v5.0.1700688539 Smart Gateway Operator 5.0.1700688539 Succeeded ----