diff --git a/modules/jaeger-install-elasticsearch.adoc b/modules/jaeger-install-elasticsearch.adoc index 8300bfab29fe..cd5d21cb5454 100644 --- a/modules/jaeger-install-elasticsearch.adoc +++ b/modules/jaeger-install-elasticsearch.adoc @@ -11,7 +11,7 @@ The default Jaeger deployment uses in-memory storage because it is designed to b .Prerequisites * Access to the {product-title} web console. -* An account with the `cluster-admin` role. +* An account with the `cluster-admin` role. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. [WARNING] ==== @@ -25,7 +25,7 @@ If you have already installed the Elasticsearch Operator as part of OpenShift cl .Procedure -. Log in to the {product-title} web console as a user with the `cluster-admin` role. +. Log in to the {product-title} web console as a user with the `cluster-admin` role. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. . Navigate to *Operators* -> *OperatorHub*. diff --git a/modules/jaeger-install.adoc b/modules/jaeger-install.adoc index c8fc2517c508..0f6d0766a29b 100644 --- a/modules/jaeger-install.adoc +++ b/modules/jaeger-install.adoc @@ -13,8 +13,8 @@ By default the Operator is installed in the `openshift-operators` project. .Prerequisites * Access to the {product-title} web console. -* An account with the `cluster-admin` role. -* If you require persistent storage, you must also install the Elasticsearch Operator before installing the Jaeger Operator. +* An account with the `cluster-admin` role. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. +* If you require persistent storage, you must also install the OpenShift Elasticsearch Operator before installing the Jaeger Operator. [WARNING] ==== @@ -23,7 +23,7 @@ Do not install Community versions of the Operators. Community Operators are not .Procedure -. Log in to the {product-title} web console as a user with the `cluster-admin` role. +. Log in to the {product-title} web console as a user with the `cluster-admin` role. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. . Navigate to *Operators* -> *OperatorHub*. diff --git a/modules/ossm-control-plane-profiles.adoc b/modules/ossm-control-plane-profiles.adoc index 4aad50ae0214..d29924aade2e 100644 --- a/modules/ossm-control-plane-profiles.adoc +++ b/modules/ossm-control-plane-profiles.adoc @@ -17,13 +17,13 @@ To add custom profiles, you must first create a ConfigMap named `smcp-templates` .Prerequisites * An installed, verified {ProductShortName} Operator. -* An account with the `cluster-admin` role. +* An account with the `cluster-admin` role. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. * Location of the Operator deployment. * Access to the {product-title} Command-line Interface (CLI) also known as `oc`. .Procedure -. Log in to the {product-title} CLI as a cluster administrator. +. Log in to the {product-title} CLI as a `cluster-admin`. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. . From the CLI, run this command to create the ConfigMap named `smcp-templates` in the `openshift-operators` project and replace `` with the location of the `ServiceMeshControlPlane` files on your local disk: + diff --git a/modules/ossm-document-attributes.adoc b/modules/ossm-document-attributes.adoc index cbb0e4369e2c..9b59b462a243 100644 --- a/modules/ossm-document-attributes.adoc +++ b/modules/ossm-document-attributes.adoc @@ -10,6 +10,7 @@ // :product-title: OpenShift Container Platform :ProductName: Red Hat OpenShift Service Mesh +:product-dedicated: Red Hat OpenShift Dedicated :ProductShortName: Service Mesh :ProductRelease: :ProductVersion: 2.0.6 diff --git a/modules/ossm-kiali-service-mesh.adoc b/modules/ossm-kiali-service-mesh.adoc index 759082e2aeb7..081c1e076448 100644 --- a/modules/ossm-kiali-service-mesh.adoc +++ b/modules/ossm-kiali-service-mesh.adoc @@ -14,4 +14,4 @@ Installing Kiali via the Service Mesh on {product-title} differs from community * Ingress has been enabled by default. * Updates have been made to the Kiali ConfigMap. * Updates have been made to the ClusterRole settings for Kiali. -* Users should not manually edit the ConfigMap or the Kiali custom resource files as those changes might be overwritten by the {ProductShortName} or Kiali operators. All configuration for Kiali running on {ProductName} is done in the `ServiceMeshControlPlane` custom resource file and there are limited configuration options. Updating the operator files should be restricted to those users with cluster-admin privileges. +* Do not edit the ConfigMap or the Kiali custom resource files as those changes might be overwritten by the {ProductShortName} or Kiali Operators. All configuration for Kiali running on {ProductName} is done in the `ServiceMeshControlPlane` custom resource file and there are limited configuration options. Updating the Operator files should be restricted to those users with `cluster-admin` privileges. If you use {product-dedicated}, updating the operator files should be restricted to those users with `dedicated-admin` privileges. diff --git a/modules/ossm-remove-cleanup.adoc b/modules/ossm-remove-cleanup.adoc index 2346b1f4b454..a69783196d05 100644 --- a/modules/ossm-remove-cleanup.adoc +++ b/modules/ossm-remove-cleanup.adoc @@ -6,7 +6,12 @@ [id="ossm-remove-cleanup_{context}"] = Clean up Operator resources -Follow this procedure to manually remove resources left behind after removing the {ProductName} Operator by using the OpenShift console. +You can manually remove resources left behind after removing the {ProductName} Operator using the OpenShift console. + +.Prerequisites + +* An account with cluster administration access. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. +* Access to the {product-title} Command-line Interface (CLI) also known as `oc`. .Procedure diff --git a/modules/ossm-rn-new-features.adoc b/modules/ossm-rn-new-features.adoc index 237e58f0994e..3c31061ef543 100644 --- a/modules/ossm-rn-new-features.adoc +++ b/modules/ossm-rn-new-features.adoc @@ -36,6 +36,10 @@ Result – If changed, describe the current user experience |2.0.0 |=== +== {ProductName} on {product-dedicated} and Microsoft Azure Red Hat OpenShift + +{ProductName} is now supported through {product-dedicated} and Microsoft Azure Red Hat OpenShift. + == New features {ProductName} 2.0.6 This release of {ProductName} addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes. diff --git a/modules/ossm-supported-configurations.adoc b/modules/ossm-supported-configurations.adoc index 1de158172adc..ce06760c6590 100644 --- a/modules/ossm-supported-configurations.adoc +++ b/modules/ossm-supported-configurations.adoc @@ -11,6 +11,11 @@ The following configurations are supported for the current release of {ProductN * Red Hat {product-title} version 4.x. +[NOTE] +==== +Red Hat OpenShift Online is not supported for {ProductName}. +==== + * The deployment must be contained to a single {product-title} cluster that is not federated. * This release of {ProductName} is only available on {product-title} x86_64, IBM Z, and IBM Power Systems. ** IBM Z is only supported on {product-title} 4.6 and later. diff --git a/modules/ossm-tutorial-bookinfo-install.adoc b/modules/ossm-tutorial-bookinfo-install.adoc index c6cc18e58dbe..177fe57d6dc8 100644 --- a/modules/ossm-tutorial-bookinfo-install.adoc +++ b/modules/ossm-tutorial-bookinfo-install.adoc @@ -23,7 +23,7 @@ The Bookinfo sample application cannot be installed on IBM Z and IBM Power Syste .Procedure -. Log in to the {product-title} web console as a user with cluster-admin rights. +. Log in to the {product-title} web console as a user with cluster-admin rights. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. . Click to *Home* -> *Projects*. diff --git a/modules/ossm-updating-smcp.adoc b/modules/ossm-updating-smcp.adoc index 8be27cf10088..e83f04d45944 100644 --- a/modules/ossm-updating-smcp.adoc +++ b/modules/ossm-updating-smcp.adoc @@ -10,7 +10,7 @@ You can create or edit the `ServiceMeshControlPlane` with the command line. .Procedure -. Log in to the {product-title} CLI as a user with the `cluster-admin` role. Enter the following command. Enter your username and password when prompted. +. Log in to the {product-title} CLI as a user with the `cluster-admin` role. If you use {product-dedicated}, log in as a user with the `dedicated-admin` role. After you run the following command, enter your username and password when prompted: + [source,terminal] ---- diff --git a/modules/ossm-vs-istio.adoc b/modules/ossm-vs-istio.adoc index 62880d2d71c6..8b507d784fdf 100644 --- a/modules/ossm-vs-istio.adoc +++ b/modules/ossm-vs-istio.adoc @@ -106,7 +106,7 @@ A {ProductName} control plane component called Istio OpenShift Routing (IOR) syn [id="ossm-catch-all-domains_{context}"] === Catch-all domains -Catch-all domains ("\*") are not supported. If one is found in the Gateway definition, {ProductName} _will_ create the route, but will rely on OpenShift to create a default hostname. This means that the newly created route will __not__ be a catch all ("*") route, instead it will have a hostname in the form `[-].`. Refer to the OpenShift documentation for more information about how default hostnames work and how a cluster administrator can customize it. +Catch-all domains ("\*") are not supported. If one is found in the Gateway definition, {ProductName} _will_ create the route, but will rely on OpenShift to create a default hostname. This means that the newly created route will __not__ be a catch all ("*") route, instead it will have a hostname in the form `[-].`. Refer to the OpenShift documentation for more information about how default hostnames work and how a `cluster-admin` can customize it. If you use {product-dedicated}, refer to the {product-dedicated} the `dedicated-admin` role. [id="ossm-subdomains_{context}"] === Subdomains diff --git a/service_mesh/v2x/installing-ossm.adoc b/service_mesh/v2x/installing-ossm.adoc index 6293282093d0..1d7a9c52389f 100644 --- a/service_mesh/v2x/installing-ossm.adoc +++ b/service_mesh/v2x/installing-ossm.adoc @@ -9,7 +9,7 @@ To install {ProductName}, first install the required Operators on {product-title .Prerequisites * Read the xref:../../service_mesh/v2x/preparing-ossm-installation.adoc#preparing-ossm-installation[Preparing to install {ProductName}] process. -* An account with the `cluster-admin` role. +* An account with the `cluster-admin` role. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. The following steps show how to install a basic instance of {ProductName} on {product-title}. diff --git a/service_mesh/v2x/ossm-support.adoc b/service_mesh/v2x/ossm-support.adoc index 232881965a5f..dc34c3fe8da1 100644 --- a/service_mesh/v2x/ossm-support.adoc +++ b/service_mesh/v2x/ossm-support.adoc @@ -15,7 +15,7 @@ include::modules/about-must-gather.adoc[leveloffset=+1] === Prerequisites -* Access to the cluster as a user with the `cluster-admin` role. +* Access to the cluster as a user with the `cluster-admin` role. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role. * The {product-title} CLI (`oc`) installed.