Skip to content

Commit 9e18c28

Browse files
committed
ROSA migration fixes
1 parent 0de0a74 commit 9e18c28

13 files changed

+61
-90
lines changed

modules/rosa-sts-cluster-terraform-execute.adoc

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ endif::[]
1111
:_content-type: PROCEDURE
1212

1313
[id="rosa-sts-cluster-terraform-execute_{context}"]
14-
= Using Terraform to create your ROSA cluster
14+
= Using Terraform to create your {product-title} cluster
1515

1616
After you create the Terraform files, you must initiate Terraform to provide all of the required dependencies. Then apply the Terraform plan.
1717

@@ -90,7 +90,7 @@ Do you want to perform these actions?
9090
----
9191
endif::tf-rosa-classic[]
9292
+
93-
If you enter `yes`, your Terraform plan starts, creating your AWS account roles, Operator roles, and your ROSA Classic cluster.
93+
If you enter `yes`, your Terraform plan starts, creating your AWS account roles, Operator roles, and your {product-title} cluster.
9494

9595
.Verification
9696
. Verify that your cluster was created by running the following command:
@@ -102,11 +102,20 @@ $ rosa list clusters
102102
+
103103
.Example output showing a cluster's ID, name, and status
104104
+
105+
ifdef::openshift-rosa-hcp[]
106+
[source,terminal]
107+
----
108+
ID NAME STATE TOPOLOGY
109+
27c3snjsupa9obua74ba8se5kcj11269 rosa-tf-demo ready Hosted CP
110+
----
111+
endif::openshift-rosa-hcp[]
112+
ifdef::openshift-rosa[]
105113
[source,terminal]
106114
----
107115
ID NAME STATE TOPOLOGY
108116
27c3snjsupa9obua74ba8se5kcj11269 rosa-tf-demo ready Classic (STS)
109117
----
118+
endif::openshift-rosa[]
110119

111120
. Verify that your account roles were created by running the following command:
112121
+

modules/rosa-sts-cluster-terraform-setup.adoc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,7 @@ endif::[]
1414
[id="rosa-sts-cluster-terraform-setup_{context}"]
1515
= Preparing your environment for Terraform
1616

17-
Before you can create your
18-
ifdef::tf-classic-defaults[]
19-
{rosa-classic-short}
20-
endif::tf-classic-defaults[]
21-
ifdef::tf-hcp-defaults[]
22-
{rosa-short}
23-
endif::tf-hcp-defaults[]
24-
cluster by using Terraform, you need to export your link:https://console.redhat.com/openshift/token[offline {cluster-manager-first} token].
17+
Before you can create your {product-title} cluster by using Terraform, you need to export your link:https://console.redhat.com/openshift/token[offline {cluster-manager-first} token].
2518

2619
.Procedure
2720
. *Optional*: Because the Terraform files get created in your current directory during this procedure, you can create a new directory to store these files and navigate into it by running the following command:

modules/rosa-sts-overview-of-the-default-cluster-specifications.adoc

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,11 @@ endif::[]
2424
[id="rosa-sts-overview-of-the-default-cluster-specifications_{context}"]
2525
= Overview of the default cluster specifications
2626

27-
ifndef::tf-classic,tf-hcp[]
28-
You can quickly create a
29-
ifdef::openshift-rosa-hcp[]
30-
{rosa-title} cluster by using the default installation options.
31-
endif::openshift-rosa-hcp[]
32-
ifdef::openshift-rosa[]
33-
ifdef::hcp-quickstart,hcp[]
34-
{rosa-title} cluster by using the default installation options.
35-
endif::hcp-quickstart,hcp[]
36-
ifndef::hcp-quickstart,hcp[]
37-
{product-title} (ROSA) cluster with the {sts-first} by using the default installation options.
38-
endif::hcp-quickstart,hcp[]
39-
endif::openshift-rosa[]
27+
You can quickly create a {product-title} cluster by using the default installation options.
28+
4029
The following summary describes the default cluster specifications.
41-
endif::tf-classic,tf-hcp[]
4230

43-
ifdef::openshift-rosa-hcp,hcp[]
4431
.Default {product-title} cluster specifications
45-
endif::openshift-rosa-hcp,hcp[]
46-
ifdef::openshift-rosa[]
47-
.Default ROSA with STS cluster specifications
48-
endif::openshift-rosa[]
4932

5033
[cols=".^1,.^3a",options="header"]
5134
|===

modules/rosa-sts-terraform-prerequisites.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
To use link:https://registry.terraform.io/providers/terraform-redhat/rhcs/latest/docs[the Red{nbsp}Hat Cloud Services provider] inside your Terraform configuration, you must meet the following prerequisites:
1010

11-
* You have installed the {product-title} (ROSA) command-line interface (CLI) tool.
11+
* You have installed the {product-title} command-line interface (CLI) tool.
1212
* You have your offline link:https://console.redhat.com/openshift/token/rosa[{cluster-manager-first} token].
1313
* You have installed link:https://developer.hashicorp.com/terraform/downloads[Terraform version 1.4.6] or newer.
1414
* You have created your AWS account-wide IAM roles.

rosa_hcp/rosa-hcp-aws-private-creating-cluster.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="rosa-hcp-aws-private-creating-cluster"]
3-
= Creating a private cluster on {hcp-title}
3+
= Creating a private cluster on {product-title}
44
include::_attributes/attributes-openshift-dedicated.adoc[]
55
:context: rosa-hcp-aws-private-creating-cluster
66

77
toc::[]
88

9-
For {rosa-title} workloads that do not require public internet access, you can create a private cluster.
9+
For {product-title} workloads that do not require public internet access, you can create a private cluster.
1010

1111
//include::modules/osd-aws-privatelink-about.adoc[leveloffset=+1]
1212
//include::modules/osd-aws-privatelink-required-resources.adoc[leveloffset=+1]

rosa_hcp/rosa-hcp-cluster-no-cni.adoc

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="rosa-hcp-cluster-no-cli"]
3-
= {hcp-title} clusters without a CNI plugin
3+
= {product-title} clusters without a CNI plugin
44
include::_attributes/attributes-openshift-dedicated.adoc[]
55
include::_attributes/common-attributes.adoc[]
66
:context: rosa-hcp-cluster-no-cni
77

88
toc::[]
99

10-
You can use your own Container Network Interface (CNI) plugin when creating a
11-
ifdef::openshift-rosa[]
12-
{rosa-title}
13-
endif::openshift-rosa[]
14-
ifdef::openshift-rosa-hcp[]
15-
{product-title}
16-
endif::openshift-rosa-hcp[]
17-
cluster. You can create a {rosa-short} cluster without a CNI and install your own CNI plugin after cluster creation.
10+
You can use your own Container Network Interface (CNI) plugin when creating a {product-title} cluster. You can create a {product-title} cluster without a CNI and install your own CNI plugin after cluster creation.
1811

1912
[IMPORTANT]
2013
====
2114
For customers who choose to use their own CNI, the responsibility of CNI plugin support belongs to the customer in coordination with their chosen CNI vendor.
2215
====
2316

24-
The default plugin for {rosa-short} is the xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes network plugin]. This plugin is the only Red Hat supported CNI plugin for {rosa-short}.
17+
The default plugin for {product-title} is the xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes network plugin]. This plugin is the only Red Hat supported CNI plugin for {product-title}.
2518

26-
If you choose to use your own CNI for {rosa-short} clusters, it is strongly recommended that you obtain commercial support from the plugin vendor before creating your clusters. Red Hat support cannot assist with CNI-related issues such as pod to pod traffic for customers who choose to use their own CNI. Red Hat still provides support for all non-CNI issues. If you want CNI-related support from Red Hat, you must install the cluster with the default OVN-Kubernetes network plugin. For more information, see the xref:../rosa_architecture/rosa_policy_service_definition/rosa-policy-responsibility-matrix.adoc#rosa-policy-responsibility-matrix[responsibility matrix].
19+
If you choose to use your own CNI for {product-title} clusters, it is strongly recommended that you obtain commercial support from the plugin vendor before creating your clusters. Red Hat support cannot assist with CNI-related issues such as pod to pod traffic for customers who choose to use their own CNI. Red Hat still provides support for all non-CNI issues. If you want CNI-related support from Red Hat, you must install the cluster with the default OVN-Kubernetes network plugin. For more information, see the xref:../rosa_architecture/rosa_policy_service_definition/rosa-policy-responsibility-matrix.adoc#rosa-policy-responsibility-matrix[responsibility matrix].
2720

2821
[id="rosa-hcp-no-cni-cluster-creation"]
29-
== Creating a {rosa-short} cluster without a CNI plugin
22+
== Creating a {product-title} cluster without a CNI plugin
3023

3124
=== Prerequisites
3225
* Ensure that you have completed the xref:../rosa_planning/rosa-hcp-aws-prereqs.adoc#rosa-hcp-aws-prereqs[AWS prerequisites].

rosa_hcp/rosa-hcp-creating-cluster-with-aws-kms-key.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
66

77
toc::[]
88

9-
Create a {rosa-title} cluster using a custom AWS Key Management Service (KMS) key.
9+
Create a {product-title} cluster using a custom AWS Key Management Service (KMS) key.
1010

1111
//include::modules/rosa-sts-creating-a-cluster-quickly-ocm.adoc[leveloffset=+1]
1212
//include::modules/rosa-sts-associating-your-aws-account.adoc[leveloffset=+2]
1313

1414
[id="rosa-hcp-creating-cluster-with-aws-kms-key-prereqs"]
15-
== {rosa-short} Prerequisites
15+
== {product-title} Prerequisites
1616

17-
To create a {rosa-short} cluster, you must have the following items:
17+
To create a {product-title} cluster, you must have the following items:
1818

1919
* A configured virtual private cloud (VPC)
2020
* Account-wide roles
2121
* An OIDC configuration
2222
* Operator roles
2323

2424
[id="rosa-hcp-creating-cluster-with-aws-kms-key-creating-vpc"]
25-
== Creating a Virtual Private Cloud for your {rosa-short} clusters
25+
== Creating a Virtual Private Cloud for your {product-title} clusters
2626

27-
You must have a Virtual Private Cloud (VPC) to create {rosa-short} cluster. Use one of the following methods to create a VPC:
27+
You must have a Virtual Private Cloud (VPC) to create {product-title} cluster. Use one of the following methods to create a VPC:
2828

2929
* Create a VPC using the ROSA command-line interface (CLI)
3030
* Create a VPC by using a Terraform template

rosa_hcp/rosa-hcp-deleting-cluster.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
:_mod-docs-content-type: ASSEMBLY
22
include::_attributes/attributes-openshift-dedicated.adoc[]
33
[id="rosa-hcp-deleting-cluster"]
4-
= Deleting a {rosa-short} cluster
4+
= Deleting a {product-title} cluster
55
:context: rosa-hcp-deleting-cluster
66

77
toc::[]
88

9-
If you want to delete a {rosa-title} cluster, you can use either the {cluster-manager-first} or the ROSA command-line interface (CLI) (`rosa`). After deleting your cluster, you can also delete the AWS Identity and Access Management (IAM) resources that are used by the cluster.
9+
If you want to delete a {product-title} cluster, you can use either the {cluster-manager-first} or the ROSA command-line interface (CLI) (`rosa`). After deleting your cluster, you can also delete the AWS Identity and Access Management (IAM) resources that are used by the cluster.
1010

1111
include::modules/rosa-hcp-deleting-cluster.adoc[leveloffset=+1]
1212

rosa_hcp/rosa-hcp-egress-zero-install.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
55
:context: rosa-hcp-egress-zero-install
66
toc::[]
77

8-
Creating {rosa-title} with {egress-zero} provides a way to enhance your cluster's stability and security by allowing your cluster to use the image registry in the local region if the cluster cannot access the internet. Your cluster first tries to pull the images from Quay, and when they aren't reached, it instead pulls the images from the image registry in the local region.
8+
Creating {product-title} with {egress-zero} provides a way to enhance your cluster's stability and security by allowing your cluster to use the image registry in the local region if the cluster cannot access the internet. Your cluster first tries to pull the images from Quay, and when they aren't reached, it instead pulls the images from the image registry in the local region.
99

1010
All public and private clusters with {egress-zero} get their Red{nbsp}Hat container images from an Amazon Elastic Container Registry (ECR) located in the local region of the cluster instead of gathering these images from various endpoints and registries on the internet. ECR provides storage for OpenShift release images as well as Red{nbsp}Hat Operators. All requests for ECR are kept within your AWS network by serving them over a VPC endpoint within your cluster.
1111

1212
{egress-zero-title} use AWS ECR to provision your clusters without the need for public internet. Because necessary cluster lifecycle processes occur over AWS private networking, AWS ECR serves as a critical service for core cluster platform images. For more information on AWS ECR, see link:https://aws.amazon.com/ecr/[Amazon Elastic Container Registry].
1313

1414
You can create a fully operational cluster that does not require a public egress by configuring a virtual private cloud (VPC) and using the `--properties zero_egress:true` flag when creating your cluster.
1515

16-
See xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading {rosa-short} clusters] to upgrade clusters using {egress-zero}.
16+
See xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading {product-title} clusters] to upgrade clusters using {egress-zero}.
1717

1818
[NOTE]
1919
====
@@ -62,17 +62,17 @@ A physical connection might exist between machines on the internal network and a
6262

6363
[IMPORTANT]
6464
====
65-
* You can use {egress-zero} on all supported versions of {rosa-short} that use the hosted control plane architecture; however, Red{nbsp}Hat suggests using the latest available z-stream release for each {ocp} version.
65+
* You can use {egress-zero} on all supported versions of {product-title} that use the hosted control plane architecture; however, Red{nbsp}Hat suggests using the latest available z-stream release for each {ocp} version.
6666
6767
* While you may install and upgrade your clusters as you would a regular cluster, due to an upstream issue with how the internal image registry functions in disconnected environments, your cluster that uses {egress-zero} will not be able to fully use all platform components, such as the image registry. You can restore these features by using the latest ROSA version when upgrading or installing your cluster.
6868
====
6969

7070
include::modules/rosa-hcp-set-environment-variables.adoc[leveloffset=+1]
7171

7272
[id="rosa-hcp-egress-zero-install-creating_{context}"]
73-
== Creating a Virtual Private Cloud for your {hcp-title} clusters
73+
== Creating a Virtual Private Cloud for your {product-title} clusters
7474

75-
You must have a Virtual Private Cloud (VPC) to create a {rosa-short} cluster. To pull images from the local ECR mirror over your VPC endpoint, you must configure a privatelink service connection and modify the default security groups with specific tags. Use one of the following methods to create a VPC:
75+
You must have a Virtual Private Cloud (VPC) to create a {product-title} cluster. To pull images from the local ECR mirror over your VPC endpoint, you must configure a privatelink service connection and modify the default security groups with specific tags. Use one of the following methods to create a VPC:
7676

7777
* Create a VPC using the ROSA command-line interface (CLI)
7878
* Create a VPC by using a Terraform template

rosa_hcp/rosa-hcp-quickstart-guide.adoc

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
66

77
toc::[]
88

9-
Follow this guide to quickly create a
10-
ifdef::openshift-rosa[]
11-
{rosa-title}
12-
endif::openshift-rosa[]
13-
ifdef::openshift-rosa-hcp[]
14-
{product-title}
15-
endif::openshift-rosa-hcp[]
16-
cluster using the command-line interface (CLI), grant user access, deploy your first application, and learn how to revoke user access and delete your cluster.
9+
Follow this guide to quickly create a {product-title} cluster using the command-line interface (CLI), grant user access, deploy your first application, and learn how to revoke user access and delete your cluster.
1710

1811
[discrete]
1912
include::modules/rosa-sts-overview-of-the-default-cluster-specifications.adoc[leveloffset=+2]
@@ -26,14 +19,14 @@ include::modules/rosa-getting-started-install-configure-cli-tools.adoc[leveloffs
2619

2720
.Next steps
2821

29-
Before you can use the {hybrid-console} to deploy {rosa-short} clusters, you must associate your AWS account with your Red{nbsp}Hat organization and create the required account-wide AWS IAM STS roles and policies for ROSA.
22+
Before you can use the {hybrid-console} to deploy {product-title} clusters, you must associate your AWS account with your Red{nbsp}Hat organization and create the required account-wide AWS IAM STS roles and policies for ROSA.
3023

3124
include::modules/rosa-sts-creating-account-wide-sts-roles-and-policies.adoc[leveloffset=+1]
3225

3326
[id="rosa-hcp-quickstart-creating-vpc"]
34-
== Creating a Virtual Private Cloud for your {rosa-short} clusters
27+
== Creating a Virtual Private Cloud for your {product-title} clusters
3528

36-
You must have an AWS Virtual Private Cloud (VPC) to create a {rosa-short} cluster. You can use the following methods to create a VPC:
29+
You must have an AWS Virtual Private Cloud (VPC) to create a {product-title} cluster. You can use the following methods to create a VPC:
3730

3831
* Create a VPC using the ROSA CLI
3932
* Create a VPC by using a Terraform template

0 commit comments

Comments
 (0)