Merge pull request #68462 from smunje1/OCPBUGS-10994

OCPBUGS-10994

Author: jeana-redhat

modules/rosa-sts-account-wide-role-and-policy-commands.adoc

@@ -11,7 +11,7 @@ This section lists the `aws` CLI commands that the `rosa` command generates in t
 [id="rosa-sts-account-wide-role-and-policy-aws-cli-manual-mode_{context}"]
 == Using manual mode for account role creation
 
-The manual role creation mode generates the `aws` commands for you to review and run. The following command starts that process:
+The manual role creation mode generates the `aws` commands for you to review and run. The following command starts that process, where `<openshift_version>` refers to your version of {product-title} (ROSA), such as `4.14`.
 
 [source,terminal]
 ----
@@ -29,7 +29,7 @@ The provided command examples include the `ManagedOpenShift` prefix. The `Manage
 aws iam create-role \
 	--role-name ManagedOpenShift-Installer-Role \
 	--assume-role-policy-document file://sts_installer_trust_policy.json \
-	--tags Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value=ManagedOpenShift Key=rosa_role_type,Value=installer
+	--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=rosa_role_type,Value=installer
 
 aws iam put-role-policy \
 	--role-name ManagedOpenShift-Installer-Role \
@@ -39,7 +39,7 @@ aws iam put-role-policy \
 aws iam create-role \
 	--role-name ManagedOpenShift-ControlPlane-Role \
 	--assume-role-policy-document file://sts_instance_controlplane_trust_policy.json \
-	--tags Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value=ManagedOpenShift Key=rosa_role_type,Value=instance_controlplane
+	--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=rosa_role_type,Value=instance_controlplane
 
 aws iam put-role-policy \
 	--role-name ManagedOpenShift-ControlPlane-Role \
@@ -49,7 +49,7 @@ aws iam put-role-policy \
 aws iam create-role \
 	--role-name ManagedOpenShift-Worker-Role \
 	--assume-role-policy-document file://sts_instance_worker_trust_policy.json \
-	--tags Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value=ManagedOpenShift Key=rosa_role_type,Value=instance_worker
+	--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=rosa_role_type,Value=instance_worker
 
 aws iam put-role-policy \
 	--role-name ManagedOpenShift-Worker-Role \
@@ -59,7 +59,7 @@ aws iam put-role-policy \
 aws iam create-role \
 	--role-name ManagedOpenShift-Support-Role \
 	--assume-role-policy-document file://sts_support_trust_policy.json \
-	--tags Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value=ManagedOpenShift Key=rosa_role_type,Value=support
+	--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=rosa_role_type,Value=support
 
 aws iam put-role-policy \
 	--role-name ManagedOpenShift-Support-Role \
@@ -69,27 +69,27 @@ aws iam put-role-policy \
 aws iam create-policy \
 	--policy-name ManagedOpenShift-openshift-ingress-operator-cloud-credentials \
 	--policy-document file://openshift_ingress_operator_cloud_credentials_policy.json \
-	--tags Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-ingress-operator Key=operator_name,Value=cloud-credentials
+	--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-ingress-operator Key=operator_name,Value=cloud-credentials
 
 aws iam create-policy \
 	--policy-name ManagedOpenShift-openshift-cluster-csi-drivers-ebs-cloud-credent \
 	--policy-document file://openshift_cluster_csi_drivers_ebs_cloud_credentials_policy.json \
-	--tags Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-cluster-csi-drivers Key=operator_name,Value=ebs-cloud-credentials
+	--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-cluster-csi-drivers Key=operator_name,Value=ebs-cloud-credentials
 
 aws iam create-policy \
 	--policy-name ManagedOpenShift-openshift-machine-api-aws-cloud-credentials \
 	--policy-document file://openshift_machine_api_aws_cloud_credentials_policy.json \
-	--tags Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-machine-api Key=operator_name,Value=aws-cloud-credentials
+	--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-machine-api Key=operator_name,Value=aws-cloud-credentials
 
 aws iam create-policy \
 	--policy-name ManagedOpenShift-openshift-cloud-credential-operator-cloud-crede \
 	--policy-document file://openshift_cloud_credential_operator_cloud_credential_operator_iam_ro_creds_policy.json \
-	--tags Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-cloud-credential-operator Key=operator_name,Value=cloud-credential-operator-iam-ro-creds
+	--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-cloud-credential-operator Key=operator_name,Value=cloud-credential-operator-iam-ro-creds
 
 aws iam create-policy \
 	--policy-name ManagedOpenShift-openshift-image-registry-installer-cloud-creden \
 	--policy-document file://openshift_image_registry_installer_cloud_credentials_policy.json \
-	--tags Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-image-registry Key=operator_name,Value=installer-cloud-credentials
+	--tags Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value=ManagedOpenShift Key=operator_namespace,Value=openshift-image-registry Key=operator_name,Value=installer-cloud-credentials
 ----
 
 [discrete]

modules/rosa-sts-account-wide-roles-and-policies.adoc

@@ -7,7 +7,7 @@
 
 This section provides details about the account-wide IAM roles and policies that are required for ROSA deployments that use STS, including the Operator policies. It also includes the JSON files that define the policies.
 
-The account-wide roles and policies are specific to an OpenShift minor release version, for example OpenShift 4.8, and are backward compatible. You can minimize the required STS resources by reusing the account-wide roles and policies for multiple clusters of the same minor version, regardless of their patch version.
+The account-wide roles and policies are specific to an OpenShift minor release version, for example OpenShift 4.14, and are backward compatible. You can minimize the required STS resources by reusing the account-wide roles and policies for multiple clusters of the same minor version, regardless of their patch version.
 
 [id="rosa-sts-account-wide-roles-and-policies-creation-methods_{context}"]
 == Methods of account-wide role creation

modules/rosa-sts-operator-role-commands.adoc

@@ -23,7 +23,7 @@ When using `manual` mode, the `aws` commands are printed to the terminal for you
 aws iam create-role \
 	--role-name <cluster_name>-<hash>-openshift-cluster-csi-drivers-ebs-cloud-credent \
 	--assume-role-policy-document file://operator_cluster_csi_drivers_ebs_cloud_credentials_policy.json \
-	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-cluster-csi-drivers Key=operator_name,Value=ebs-cloud-credentials
+	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-cluster-csi-drivers Key=operator_name,Value=ebs-cloud-credentials
 
 aws iam attach-role-policy \
 	--role-name <cluster_name>-<hash>-openshift-cluster-csi-drivers-ebs-cloud-credent \
@@ -32,7 +32,7 @@ aws iam attach-role-policy \
 aws iam create-role \
 	--role-name <cluster_name>-<hash>-openshift-machine-api-aws-cloud-credentials \
 	--assume-role-policy-document file://operator_machine_api_aws_cloud_credentials_policy.json \
-	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-machine-api Key=operator_name,Value=aws-cloud-credentials
+	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-machine-api Key=operator_name,Value=aws-cloud-credentials
 
 aws iam attach-role-policy \
 	--role-name <cluster_name>-<hash>-openshift-machine-api-aws-cloud-credentials \
@@ -41,7 +41,7 @@ aws iam attach-role-policy \
 aws iam create-role \
 	--role-name <cluster_name>-<hash>-openshift-cloud-credential-operator-cloud-crede \
 	--assume-role-policy-document file://operator_cloud_credential_operator_cloud_credential_operator_iam_ro_creds_policy.json \
-	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-cloud-credential-operator Key=operator_name,Value=cloud-credential-operator-iam-ro-creds
+	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-cloud-credential-operator Key=operator_name,Value=cloud-credential-operator-iam-ro-creds
 
 aws iam attach-role-policy \
 	--role-name <cluster_name>-<hash>-openshift-cloud-credential-operator-cloud-crede \
@@ -50,7 +50,7 @@ aws iam attach-role-policy \
 aws iam create-role \
 	--role-name <cluster_name>-<hash>-openshift-image-registry-installer-cloud-creden \
 	--assume-role-policy-document file://operator_image_registry_installer_cloud_credentials_policy.json \
-	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-image-registry Key=operator_name,Value=installer-cloud-credentials
+	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-image-registry Key=operator_name,Value=installer-cloud-credentials
 
 aws iam attach-role-policy \
 	--role-name <cluster_name>-<hash>-openshift-image-registry-installer-cloud-creden \
@@ -59,7 +59,7 @@ aws iam attach-role-policy \
 aws iam create-role \
 	--role-name <cluster_name>-<hash>-openshift-ingress-operator-cloud-credentials \
 	--assume-role-policy-document file://operator_ingress_operator_cloud_credentials_policy.json \
-	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=4.8 Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-ingress-operator Key=operator_name,Value=cloud-credentials
+	--tags Key=rosa_cluster_id,Value=<id> Key=rosa_openshift_version,Value=<openshift_version> Key=rosa_role_prefix,Value= Key=operator_namespace,Value=openshift-ingress-operator Key=operator_name,Value=cloud-credentials
 
 aws iam attach-role-policy \
 	--role-name <cluster_name>-<hash>-openshift-ingress-operator-cloud-credentials \