Merge pull request #68104 from mburke5678/fix-ded-admin-web-console

mburke5678 · web-flow · commit c51c195a74f6 · 2024-03-28T09:20:40.000-04:00
Service Mesh add dedicated-user prereq
diff --git a/modules/ossm-add-project-using-label-selectors-cli.adoc b/modules/ossm-add-project-using-label-selectors-cli.adoc
@@ -11,7 +11,12 @@ You can use label selectors to add a project to the {SMProductShortName} with th
 .Prerequisites
 * You have installed the {SMProductName} Operator.
 * The deployment has an existing `ServiceMeshMemberRoll` resource.
-* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
diff --git a/modules/ossm-add-project-using-label-selectors-console.adoc b/modules/ossm-add-project-using-label-selectors-console.adoc
@@ -11,12 +11,15 @@ You can use labels selectors to add a project to the {SMProductShortName} with t
 .Prerequisites
 * You have installed the {SMProductName} Operator.
 * The deployment has an existing `ServiceMeshMemberRoll` resource.
-* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to the {product-title} web console as `cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to the {product-title} web console as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
-. Log in to the {product-title} web console.
-
 . Navigate to *Operators* -> *Installed Operators*.
 
 . Click the *Project* menu, and from the drop-down list, select the project where your `ServiceMeshMemberRoll` resource is deployed. For example, *istio-system*.
diff --git a/modules/ossm-config-control-plane-infrastructure-node-cli.adoc b/modules/ossm-config-control-plane-infrastructure-node-cli.adoc
@@ -13,7 +13,12 @@ If the control plane will run on a worker node, skip this task.
 .Prerequisites
 
 * You have installed the {SMProductName} Operator.
-* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
diff --git a/modules/ossm-config-control-plane-infrastructure-node-console.adoc b/modules/ossm-config-control-plane-infrastructure-node-console.adoc
@@ -13,7 +13,12 @@ If the control plane will run on a worker node, skip this task.
 .Prerequisites
 
 * You have installed the {SMProductName} Operator.
-* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
diff --git a/modules/ossm-config-individual-control-plane-infrastructure-node-cli.adoc b/modules/ossm-config-individual-control-plane-infrastructure-node-cli.adoc
@@ -13,7 +13,12 @@ If the control plane will run on a worker node, skip this task.
 .Prerequisites
 
 * You have installed the {SMProductName} Operator.
-* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
diff --git a/modules/ossm-config-individual-control-plane-infrastructure-node-console.adoc b/modules/ossm-config-individual-control-plane-infrastructure-node-console.adoc
@@ -13,7 +13,12 @@ If the control plane will run on a worker node, skip this task.
 .Prerequisites
 
 * You have installed the {SMProductName} Operator.
-* You are logged in as a user with the `cluster-admin` role. If you use {product-dedicated}, you are logged in as a user with the `dedicated-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
diff --git a/modules/ossm-control-plane-cli.adoc b/modules/ossm-control-plane-cli.adoc
@@ -12,16 +12,15 @@ You can deploy a basic `ServiceMeshControlPlane` from the command line.
 
 * The {SMProductName} Operator must be installed.
 * Access to the OpenShift CLI (`oc`).
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
-. Log in to the {product-title} CLI as a user with the `cluster-admin` role. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role.
-+
-[source,terminal]
-----
-$ oc login --username=<NAMEOFUSER> https://<HOSTNAME>:6443
-----
-+
 . Create a project named `istio-system`.
 +
 [source,terminal]
diff --git a/modules/ossm-deploy-cluster-wide-control-plane-cli.adoc b/modules/ossm-deploy-cluster-wide-control-plane-cli.adoc
@@ -12,16 +12,15 @@ You can configure the `ServiceMeshControlPlane` resource for cluster-wide deploy
 
 * The {SMProductName} Operator is installed.
 * You have access to the OpenShift CLI (`oc`).
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
-. Log in to the {product-title} CLI as a user with the `cluster-admin` role. If you use {product-dedicated}, you must have an account with the `dedicated-admin` role.
-+
-[source,terminal]
-----
-$ oc login --username=<NAMEOFUSER> https://<HOSTNAME>:6443
-----
-+
 . Create a project named `istio-system`.
 +
 [source,terminal]
diff --git a/modules/ossm-deploy-cluster-wide-control-plane-console.adoc b/modules/ossm-deploy-cluster-wide-control-plane-console.adoc
@@ -11,7 +11,12 @@ You can configure the `ServiceMeshControlPlane` resource for cluster-wide deploy
 .Prerequisites
 
 * The {SMProductName} Operator is installed.
-* You are logged in using an account with the `cluster-admin` role, or if you use {product-dedicated} with the `dedicated-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
diff --git a/modules/ossm-tutorial-bookinfo-install.adoc b/modules/ossm-tutorial-bookinfo-install.adoc
@@ -15,7 +15,12 @@ This tutorial walks you through how to create a sample application by creating a
 * {product-title} 4.1 or higher installed.
 * {SMProductName} {SMProductVersion} installed.
 * Access to the OpenShift CLI (`oc`).
-* An account with the `cluster-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 ifndef::openshift-rosa[]
 [NOTE]
@@ -31,8 +36,6 @@ The commands in this section assume the {SMProductShortName} control plane proje
 
 .Procedure
 
-. 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 *Home* -> *Projects*.
 
 . Click *Create Project*.
diff --git a/modules/ossm-tutorial-bookinfo-verify-install.adoc b/modules/ossm-tutorial-bookinfo-verify-install.adoc
@@ -14,11 +14,15 @@ To confirm that the sample Bookinfo application was successfully deployed, perfo
 
 * {SMProductName} installed.
 * Complete the steps for installing the Bookinfo sample app.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure from CLI
 
-. Log in to the {product-title} CLI.
-
 . Verify that all pods are ready with this command:
 +
 [source,terminal]
@@ -51,7 +55,7 @@ echo "http://$GATEWAY_URL/productpage"
 
 . Obtain the address for the Kiali web console.
 
-.. 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.
+.. Log in to the {product-title} web console.
 
 .. Navigate to *Networking* -> *Routes*.
 
diff --git a/modules/ossm-validate-smcp-cli.adoc b/modules/ossm-validate-smcp-cli.adoc
@@ -7,15 +7,19 @@ This module is included in the following assemblies:
 = Validating your SMCP installation with the CLI
 You can validate the creation of the `ServiceMeshControlPlane` from the command line.
 
+. Prerequisites
+
+* The {SMProductName} Operator must be installed.
+* Access to the OpenShift CLI (`oc`).
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+
 .Procedure
 
-. Log in to the {product-title} CLI as a user with the `cluster-admin` role. If you use Red Hat OpenShift Dedicated, you must have an account with the `dedicated-admin` role.
-+
-[source,terminal]
-----
-$ oc login https://<HOSTNAME>:6443
-----
-+
 . Run the following command to verify the {SMProductShortName} control plane installation, where `istio-system` is the namespace where you installed the {SMProductShortName} control plane.
 +
 [source,terminal]
diff --git a/modules/ossm-validate-smcp-kiali.adoc b/modules/ossm-validate-smcp-kiali.adoc
@@ -8,11 +8,20 @@ This module is included in the following assemblies:
 
 You can use the Kiali console to validate your {SMProductShortName} installation. The Kiali console offers several ways to validate your {SMProductShortName} components are deployed and configured properly.
 
-.Procedure
+. Prerequisites
+
+* The {SMProductName} Operator must be installed.
+* Access to the OpenShift CLI (`oc`).
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as`cluster-admin`.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to {product-title} as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
-. 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.
+.Procedure
 
-. Navigate to *Networking* -> *Routes*.
+. In the {product-title} web console, navigate to *Networking* -> *Routes*.
 
 . On the *Routes* page, select the {SMProductShortName} control plane project, for example `istio-system`, from the *Namespace* menu.
 +
