Skip to content

Commit a12ee49

Browse files
authored
Merge pull request #97669 from mletalie/OSDOCS-15876
[OSDOCS-15876]Prune "About"
2 parents 67757a9 + 14d0504 commit a12ee49

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

_topic_maps/_topic_map_rosa.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ Distros: openshift-rosa
2828
Topics:
2929
- Name: Welcome
3030
File: index
31-
- Name: Learn more about ROSA with HCP
32-
File: about-hcp
33-
- Name: AWS STS and ROSA with HCP explained
34-
File: cloud-experts-rosa-hcp-sts-explained
31+
#- Name: Learn more about ROSA with HCP
32+
# File: about-hcp
33+
#- Name: AWS STS and ROSA with HCP explained
34+
# File: cloud-experts-rosa-hcp-sts-explained
3535
- Name: Legal notice
3636
File: legal-notice
3737
Distros: openshift-rosa

cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-rosa-sts-explained.adoc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ This tutorial outlines the two options for allowing {product-title} (ROSA) to in
1313

1414
[NOTE]
1515
====
16-
This content currently covers ROSA Classic with AWS STS. For ROSA with hosted control planes (HCP) with AWS STS, see xref:../../welcome/cloud-experts-rosa-hcp-sts-explained.adoc#cloud-experts-rosa-hcp-sts-explained[AWS STS and ROSA with HCP explained].
16+
This content currently covers ROSA Classic with AWS STS.
17+
ifdef::openshift-rosa-hcp[]
18+
For ROSA with hosted control planes (HCP) with AWS STS, see xref:../../welcome/cloud-experts-rosa-hcp-sts-explained.adoc#cloud-experts-rosa-hcp-sts-explained[AWS STS and ROSA with HCP explained].
19+
endif::openshift-rosa-hcp[]
1720
====
1821

1922
This tutorial will:
@@ -92,7 +95,7 @@ The policies determine the allowed actions for each of the roles. See xref:../..
9295
+
9396
[.small]
9497
--
95-
1. This policy is used by the cluster Operator roles, listed below. The Operator roles are created in a second step because they are dependent on an existing cluster name and cannot be created at the same time as the account-wide roles.
98+
1. This policy is used by the cluster Operator roles, listed below. The Operator roles are created in a second step because they are dependent on an existing cluster name and cannot be created at the same time as the account-wide roles.
9699
--
97100
+
98101
** The Operator roles are:
@@ -146,7 +149,7 @@ image::cloud-experts-sts-explained_oidc_op_roles.png[]
146149
== ROSA with STS use cases
147150

148151
.Creating nodes at cluster install
149-
The Red{nbsp}Hat installation program uses the `RH-Managed-OpenShift-Installer` role and a trust policy to assume the `Managed-OpenShift-Installer-Role` role in the customer's account. This process returns temporary credentials from AWS STS. The installation program begins making the required API calls with the temporary credentials just received from STS. The installation program creates the required infrastructure in AWS. The credentials expire within an hour and the installation program no longer has access to the customer's account.
152+
The Red{nbsp}Hat installation program uses the `RH-Managed-OpenShift-Installer` role and a trust policy to assume the `Managed-OpenShift-Installer-Role` role in the customer's account. This process returns temporary credentials from AWS STS. The installation program begins making the required API calls with the temporary credentials just received from STS. The installation program creates the required infrastructure in AWS. The credentials expire within an hour and the installation program no longer has access to the customer's account.
150153

151154
The same process also applies for support cases. In support cases, a Red{nbsp}Hat site reliability engineer (SRE) replaces the installation program.
152155

support/troubleshooting/rosa-troubleshooting-installations-hcp.adoc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ endif::openshift-rosa-hcp[]
2222
include::modules/rosa-troubleshoot-hcp-install.adoc[leveloffset=+1]
2323
2424
//remove these conditionals once HCP migration happens
25-
ifndef::openshift-rosa-hcp[]
26-
[role="_additional-resources"]
27-
.Additional resources
28-
* For information about the required IAM, see xref:../../rosa_planning/rosa-sts-ocm-role.adoc#rosa-sts-ocm-role[ROSA IAM role resources].
29-
* For information about the AWS STS prerequisites for {hcp-title} clusters, see xref:../../welcome/cloud-experts-rosa-hcp-sts-explained.adoc#cloud-experts-rosa-hcp-sts-explained[AWS STS and ROSA with HCP explained].
30-
endif::openshift-rosa-hcp[]
25+
26+
// [role="_additional-resources"]
27+
// .Additional resources
28+
// * For information about the required IAM, see xref:../../rosa_planning/rosa-sts-ocm-role.adoc#rosa-sts-ocm-role[ROSA IAM role resources].
29+
// ifndef::openshift-rosa-hcp[]
30+
// * For information about the AWS STS prerequisites for {hcp-title} clusters, see xref:../../welcome/cloud-experts-rosa-hcp-sts-explained.adoc#cloud-experts-rosa-hcp-sts-explained[AWS STS and ROSA with HCP explained].
31+
// endif::openshift-rosa-hcp[]
3132
3233
include::modules/rosa-hcp-no-console-access.adoc[leveloffset=+1]
3334

0 commit comments

Comments
 (0)