Skip to content

Commit 6bc3267

Browse files
committed
OSDOCS-14434: Changed the ROSA name variables.
1 parent c226350 commit 6bc3267

File tree

10 files changed

+145
-143
lines changed

10 files changed

+145
-143
lines changed

_attributes/attributes-openshift-dedicated.adoc

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@
2727
:sts-first: Security Token Service (STS)
2828
:sts-full: Security Token Service
2929
:sts-short: STS
30+
// ROSA specific
31+
:hcp: hosted control planes
32+
:rosa-first: Red Hat OpenShift Service on AWS (ROSA) with {hcp} (HCP)
33+
:rosa-short: ROSA with HCP
34+
:rosa-classic-first: {product-title} (ROSA) (classic architecture)
35+
:rosa-classic: Red Hat OpenShift Service on AWS (classic architecture)
36+
:rosa-classic-short: ROSA (classic)
37+
:classic: {rosa-classic}
38+
:classic-short: {rosa-classic-short}
3039
//logging
3140
:logging-title: logging for Red Hat OpenShift
3241
:logging-title-uc: Logging for Red Hat OpenShift
@@ -49,11 +58,6 @@
4958
//Formerly known as CodeReady Containers and CodeReady Workspaces
5059
:openshift-local-productname: Red Hat OpenShift Local
5160
:openshift-dev-spaces-productname: Red Hat OpenShift Dev Spaces
52-
:hcp: hosted control planes
53-
:hcp-title: ROSA with HCP
54-
:hcp-title-first: {product-title} (ROSA) with {hcp} (HCP)
55-
:rosa-classic: ROSA (classic architecture)
56-
:rosa-classic-first: {product-title} (ROSA) (classic architecture)
5761
:egress-lockdown: {hcp-title} clusters with zero egress
5862
//ROSA CLI variables
5963
:zero-egress: zero egress

_distro_map.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ openshift-aro:
196196
name: '4'
197197
dir: aro/4
198198
openshift-rosa:
199-
name: Red Hat OpenShift Service on AWS
199+
name: Red Hat OpenShift Service on AWS (classic architecture)
200200
author: OpenShift Documentation Project <[email protected]>
201201
site: commercial
202202
site_name: Documentation

modules/rosa-hcp-architecture.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
[id="rosa-hcp-architecture_{context}"]
66
= ROSA with HCP architecture
77

8-
In {hcp-title-first}, the ROSA service hosts a highly-available, single-tenant OpenShift control plane. The hosted control plane is deployed across 3 availability zones with 2 API server instances and 3 etcd instances.
8+
In {rosa-first}, the ROSA service hosts a highly-available, single-tenant OpenShift control plane. The hosted control plane is deployed across 3 availability zones with 2 API server instances and 3 etcd instances.
99

1010
You can create a ROSA with HCP cluster with or without an internet-facing API server. Private API servers are only accessible from your VPC subnets. You access the hosted control plane through an AWS PrivateLink endpoint.
1111

1212
The worker nodes are deployed in your AWS account and run on your VPC private subnets. You can add additional private subnets from one or more availability zones to ensure high availability. Worker nodes are shared by OpenShift components and applications. OpenShift components such as the ingress controller, image registry, and monitoring are deployed on the worker nodes hosted on your VPC.
1313

14-
.ROSA with HCP architecture
15-
image::544_OpenShift_ROSA-HCP_architecture-model.png[ROSA with HCP architecture]
14+
.{rosa-short} architecture
15+
image::544_OpenShift_ROSA-HCP_architecture-model.png[{rosa-short} architecture]
1616

1717
[id="rosa-hcp-network-architecture_{context}"]
18-
== ROSA with HCP architecture on public and private networks
19-
With ROSA with HCP, you can create your clusters on public or private networks. The following images depict the architecture of both public and private networks.
18+
== {rosa-short} architecture on public and private networks
19+
With {rosa-short}, you can create your clusters on public or private networks. The following images depict the architecture of both public and private networks.
2020

21-
.ROSA with HCP deployed on a public network
22-
image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-public.png[ROSA with HCP deployed on a public network]
21+
.{rosa-short} deployed on a public network
22+
image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-public.png[{rosa-short} deployed on a public network]
2323

24-
.ROSA with HCP deployed on a private network
25-
image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-private.png[ROSA with HCP deployed on a private network]
24+
.{rosa-short} deployed on a private network
25+
image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-private.png[{rosa-short} deployed on a private network]

rosa_cluster_admin/rosa_nodes/rosa-nodes-machinepools-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Each machine pool in a {product-title} cluster upgrades independently. Because t
9090

9191
The following image depicts how machine pools work within ROSA and {rosa-classic} clusters:
9292

93-
image::hcp-rosa-machine-pools.png[Machine pools on ROSA classic and {hcp-tilte} clusters]
93+
image::hcp-rosa-machine-pools.png[Machine pools on {rosa-classic-short} and {rosa-short} clusters]
9494

9595
[NOTE]
9696
====

rosa_release_notes/rosa-release-notes.adoc

Lines changed: 68 additions & 71 deletions
Large diffs are not rendered by default.

snippets/rosa-hcp-rn.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
// * rosa_release_notes/rosa-release-notes.adoc
44

55
:_mod-docs-content-type: SNIPPET
6-
* **Hosted control planes.** {hcp-title-first} clusters are now available as a link:https://access.redhat.com/support/offerings/techpreview[Technology Preview] feature. This new architecture provides a lower-cost, more resilient ROSA architecture. For more information, see xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[Creating {hcp-title} clusters using the default options].
6+
* **Hosted control planes.** {rosa-first} clusters are now available as a link:https://access.redhat.com/support/offerings/techpreview[Technology Preview] feature. This new architecture provides a lower-cost, more resilient ROSA architecture. For more information, see xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[Creating {rosa-short} clusters using the default options].

welcome/cloud-experts-rosa-hcp-sts-explained.adoc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="cloud-experts-rosa-hcp-sts-explained"]
3-
= AWS STS and ROSA with HCP explained
3+
= AWS STS and {rosa-short} explained
44
include::_attributes/common-attributes.adoc[]
55
include::_attributes/attributes-openshift-dedicated.adoc[]
66
:context: cloud-experts-rosa-hcp-sts-explained
7-
7+
88
toc::[]
99

1010
//rosaworkshop.io content metadata
1111
//Brought into ROSA product docs 2023-10-26
1212
//Modified for HCP 2024-4-16
1313

14-
{hcp-title-first} uses an AWS (Amazon Web Services) Security Token Service (STS) for AWS Identity Access Management (IAM) to obtain the necessary credentials to interact with resources in your AWS account.
14+
{rosa-first} uses an AWS (Amazon Web Services) Security Token Service (STS) for AWS Identity Access Management (IAM) to obtain the necessary credentials to interact with resources in your AWS account.
1515

1616
[id="credential-methods-rosa-hcp"]
1717
== AWS STS credential method
18-
As part of {hcp-title}, Red{nbsp}Hat must be granted the necessary permissions to manage infrastructure resources in your AWS account.
19-
{hcp-title} grants the cluster's automation software limited, short-term access to resources in your AWS account.
18+
As part of {rosa-short}, Red{nbsp}Hat must be granted the necessary permissions to manage infrastructure resources in your AWS account.
19+
{rosa-short} grants the cluster's automation software limited, short-term access to resources in your AWS account.
2020

2121
The STS method uses predefined roles and policies to grant temporary, least-privilege permissions to IAM roles. The credentials typically expire an hour after being requested. Once expired, they are no longer recognized by AWS and no longer have account access from API requests made with them. For more information, see the link:https://docs.aws.amazon.com/STS/latest/APIReference/welcome.html[AWS documentation].
2222

23-
AWS IAM STS roles must be created for each {hcp-title} cluster. The ROSA command-line interface (CLI) (`rosa`) manages the STS roles and helps you attach the ROSA-specific, AWS-managed policies to each role. The CLI provides the commands and files to create the roles, attach the AWS-managed policies, and an option to allow the CLI to automatically create the roles and attach the policies.
23+
AWS IAM STS roles must be created for each {rosa-short} cluster. The {rosa-short} command-line interface (CLI) (`rosa`) manages the STS roles and helps you attach the {rosa-short}-specific, AWS-managed policies to each role. The CLI provides the commands and files to create the roles, attach the AWS-managed policies, and an option to allow the CLI to automatically create the roles and attach the policies.
2424
//See [insert new xref when we have one for HCP] for more information about the different `--mode` options.
2525

2626
[id="hcp-sts-security"]
@@ -33,18 +33,18 @@ Security features for AWS STS include:
3333
* There is no need to rotate or revoke credentials. Whenever the service needs to perform an action, it obtains credentials that expire in one hour or less.
3434
* Credential expiration reduces the risks of credentials leaking and being reused.
3535

36-
{hcp-title} grants cluster software components least-privilege permissions with short-term security credentials to specific and segregated IAM roles. The credentials are associated with IAM roles specific to each component and cluster that makes AWS API calls. This method aligns with principles of least-privilege and secure practices in cloud service resource management.
36+
{rosa-short} grants cluster software components least-privilege permissions with short-term security credentials to specific and segregated IAM roles. The credentials are associated with IAM roles specific to each component and cluster that makes AWS API calls. This method aligns with principles of least-privilege and secure practices in cloud service resource management.
3737

3838
[id="components-specific-to-rosa-hcp-with-sts"]
39-
== Components of {hcp-title}
40-
* *AWS infrastructure* - The infrastructure required for the cluster including the Amazon EC2 instances, Amazon EBS storage, and networking components. See xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-aws-compute-types_rosa-service-definition[AWS compute types] to see the supported instance types for compute nodes and xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-ec2-instances_rosa-sts-aws-prereqs[provisioned AWS infrastructure] for more information on cloud resource configuration.
39+
== Components of {rosa-short}
40+
* *AWS infrastructure* - The infrastructure required for the cluster including the Amazon EC2 instances, Amazon EBS storage, and networking components. See xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-aws-compute-types_rosa-service-definition[AWS compute types] to see the supported instance types for compute nodes and xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-ec2-instances_rosa-sts-aws-prereqs[provisioned AWS infrastructure] for more information on cloud resource configuration.
4141
* *AWS STS* - A method for granting short-term, dynamic tokens to provide users the necessary permissions to temporarily interact with your AWS account resources.
4242
* *OpenID Connect (OIDC)* - A mechanism for cluster Operators to authenticate with AWS, assume the cluster roles through a trust policy, and obtain temporary credentials from AWS IAM STS to make the required API calls.
43-
* *Roles and policies* - The roles and policies used by {hcp-title} can be divided into account-wide roles and policies and Operator roles and policies.
43+
* *Roles and policies* - The roles and policies used by {rosa-short} can be divided into account-wide roles and policies and Operator roles and policies.
4444
+
4545
The policies determine the allowed actions for each of the roles.
4646
ifdef::openshift-rosa[]
47-
See xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-about-iam-resources[About IAM resources] for more details about the individual roles and policies. See xref:../rosa_planning/rosa-sts-ocm-role.adoc#rosa-sts-ocm-role[ROSA IAM role resource] for more details about trust policies.
47+
See xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-about-iam-resources[About IAM resources] for more details about the individual roles and policies. See xref:../rosa_planning/rosa-sts-ocm-role.adoc#rosa-sts-ocm-role[{rosa-short} IAM role resource] for more details about trust policies.
4848
endif::openshift-rosa[]
4949
ifdef::openshift-rosa-hcp[]
5050
See xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-about-iam-resources[About IAM resources] for more details about the individual roles and policies. See xref:../rosa_planning/rosa-hcp-prepare-iam-roles-resources.adoc#rosa-hcp-prepare-iam-roles-resources[Required IAM roles and resources] for more details on preparing these resources in your cluster.
@@ -90,9 +90,9 @@ Certain policies are used by the cluster Operator roles, listed below. The Opera
9090
** Trust policies are created for each account-wide role and each Operator role.
9191

9292
[id="deploying-rosa-hcp-with-sts-cluster"]
93-
== Deploying a {hcp-title} cluster
93+
== Deploying a {rosa-short} cluster
9494

95-
Deploying a {hcp-title} cluster follows the following steps:
95+
Deploying a {rosa-short} cluster follows the following steps:
9696

9797
. You create the account-wide roles.
9898
. You create the Operator roles.
@@ -105,7 +105,7 @@ During the cluster creation process, the ROSA CLI creates the required JSON file
105105
The ROSA CLI can automatically create the roles for you, or you can manually create them by using the `--mode manual` or `--mode auto` flags. For further details about deployment, see xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-cluster-using-customizations_rosa-sts-creating-a-cluster-with-customizations[Creating a cluster with customizations].
106106

107107
[id="hcp-sts-process"]
108-
== {hcp-title} workflow
108+
== {rosa-short} workflow
109109
The user creates the required account-wide roles. During role creation, a trust policy, known as a cross-account trust policy, is created which allows a Red{nbsp}Hat-owned role to assume the roles. Trust policies are also created for the EC2 service, which allows workloads on EC2 instances to assume roles and obtain credentials. AWS assigns a corresponding permissions policy to each role.
110110

111111
After the account-wide roles and policies are created, the user can create a cluster. Once cluster creation is initiated, the user creates the Operator roles so that cluster Operators can make AWS API calls. These roles are then assigned to the corresponding permission policies that were created earlier and a trust policy with an OIDC provider. The Operator roles differ from the account-wide roles in that they ultimately represent the pods that need access to AWS resources. Because a user cannot attach IAM roles to pods, they must create a trust policy with an OIDC provider so that the Operator, and therefore the pods, can access the roles they need.

welcome/index.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[id="welcome-index"]
33
= {product-title} {product-version} Documentation
44
include::_attributes/common-attributes.adoc[]
5+
include::_attributes/attributes-openshift-dedicated.adoc[]
56
:context: welcome-index
67
{toc}
78
{toc-title}
@@ -13,23 +14,23 @@ ifndef::openshift-rosa,openshift-telco[]
1314
Welcome to the official {product-title} {product-version} documentation, where you can learn about {product-title} and start exploring its features.
1415
endif::openshift-rosa,openshift-telco[]
1516
ifdef::openshift-rosa[]
16-
Welcome to the official {product-title} (ROSA) documentation, where you can learn about ROSA and start exploring its features.
17-
To learn about ROSA, interacting with ROSA by using {cluster-manager-first} and command-line interface (CLI) tools, consumption experience, and integration with Amazon Web Services (AWS) services, start with xref:../rosa_architecture/rosa-understanding.adoc#rosa-understanding[the Introduction to ROSA documentation].
17+
Welcome to the official {product-title} ({rosa-classic-short}) documentation, where you can learn about {rosa-classic-short} and start exploring its features.
18+
To learn about {rosa-classic-short}, interacting with {rosa-classic-short} by using {cluster-manager-first} and command-line interface (CLI) tools, consumption experience, and integration with Amazon Web Services (AWS) services, start with xref:../rosa_architecture/rosa-understanding.adoc#rosa-understanding[the Introduction to ROSA documentation].
1819

1920
image::291_OpenShift_on_AWS_Intro_1122_docs.png[{product-title}]
2021
endif::openshift-rosa[]
2122

2223
ifdef::openshift-rosa[]
23-
To navigate the ROSA documentation, use the left navigation bar.
24+
To navigate the {rosa-classic-short} documentation, use the left navigation bar.
2425
endif::[]
2526

26-
ifndef::openshift-rosa,openshift-dedicated,openshift-dpu,openshift-telco[]
27+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated,openshift-dpu,openshift-telco[]
2728
To navigate the {product-title} {product-version} documentation, you can use one of the following methods:
2829

2930
* Use the navigation bar to browse the documentation.
3031
* Select the task that interests you from xref:../welcome/learn_more_about_openshift.adoc#learn_more_about_openshift[Learn more about {product-title}].
3132
* {product-title} has a variety of layered offerings to add additional functionality and extend the capabilities of a cluster. For more information, see link:https://access.redhat.com/support/policy/updates/openshift_operators[{product-title} Operator Life Cycles]
32-
endif::openshift-rosa,openshift-dedicated,openshift-dpu,openshift-telco[]
33+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated,openshift-dpu,openshift-telco[]
3334
3435
ifdef::openshift-dpu[]
3536
To navigate the {product-title} data processing unit (DPU) documentation, use the left navigation bar.

0 commit comments

Comments
 (0)