Skip to content

Commit 8f8bd04

Browse files
authored
Merge pull request #97865 from openshift-cherrypick-robot/cherry-pick-97861-to-enterprise-4.19
[enterprise-4.19] Introduction to ROSA
2 parents ea6db1e + 363d8f8 commit 8f8bd04

File tree

7 files changed

+52
-23
lines changed

7 files changed

+52
-23
lines changed

_topic_maps/_topic_map_rosa.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ Topics:
6363
File: rosa-instance-types
6464
- Name: ROSA update life cycle
6565
File: rosa-life-cycle
66-
- Name: ROSA with HCP service definition
67-
File: rosa-hcp-service-definition
68-
- Name: ROSA with HCP instance types
69-
File: rosa-hcp-instance-types
70-
- Name: ROSA with HCP update life cycle
71-
File: rosa-hcp-life-cycle
66+
# - Name: ROSA with HCP service definition
67+
# File: rosa-hcp-service-definition
68+
# - Name: ROSA with HCP instance types
69+
# File: rosa-hcp-instance-types
70+
# - Name: ROSA with HCP update life cycle
71+
# File: rosa-hcp-life-cycle
7272
- Name: Understanding security for ROSA
7373
File: rosa-policy-process-security
7474
- Name: SRE and service account access

architecture/rosa-architecture-models.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ include::modules/rosa-hcp-classic-comparison.adoc[leveloffset=+1]
1616

1717
.Additional resources
1818

19+
ifdef::openshift-rosa-hcp[]
1920
* xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-regions-az_rosa-hcp-service-definition[Regions and availability zones]
2021

22+
endif::openshift-rosa-hcp[]
23+
2124
* xref:../rosa_architecture/rosa_policy_service_definition/rosa-policy-process-security.adoc#rosa-policy-security-regulation-compliance_rosa-policy-process-security[Security and regulation compliance]
2225
2326
include::modules/rosa-hcp-architecture.adoc[leveloffset=+1]

rosa_architecture/about-hcp.adoc

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ endif::openshift-rosa-hcp[]
7575
ifndef::openshift-rosa-hcp[]
7676
xref:../backup_and_restore/application_backup_and_restore/oadp-intro.adoc#oadp-api[Back up and restore]
7777
endif::openshift-rosa-hcp[]
78-
|
78+
ifdef::openshift-rosa-hcp[]|
7979
xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle]
80-
|
80+
endif::openshift-rosa-hcp[]|
8181
ifdef::openshift-rosa-hcp[]
8282
link:https://docs.openshift.com/rosa/architecture/rosa-architecture-models.html#rosa-architecture-models[{hcp-title} architecture]
8383
endif::openshift-rosa-hcp[]
@@ -91,9 +91,11 @@ endif::openshift-rosa-hcp[]
9191
ifndef::openshift-rosa-hcp[]
9292
xref:../../rosa_architecture/rosa_policy_service_definition/rosa-policy-process-security.adoc#rosa-policy-process-security[Understanding process and security]
9393
endif::openshift-rosa-hcp[]
94-
|
94+
95+
ifdef::openshift-rosa-hcp[]
9596
xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-hcp-service-definition[{hcp-title} service definition]
96-
|
97+
98+
endif::openshift-rosa-hcp[]
9799
xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[Updates lifecycle]
98100
|
99101
// Removed as part of OSDOCS-13310, until figures are verified.
@@ -156,9 +158,11 @@ endif::openshift-rosa-hcp[]
156158
ifndef::openshift-rosa-hcp[]
157159
xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
158160
endif::openshift-rosa-hcp[]
159-
|
161+
162+
ifdef::openshift-rosa-hcp[]
160163
xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle]
161-
|
164+
endif::openshift-rosa-hcp[]
165+
162166
ifdef::openshift-rosa-hcp[]
163167
link:https://docs.openshift.com/rosa/rosa_architecture/rosa_policy_service_definition/rosa-policy-responsibility-matrix.html#rosa-policy-responsibility-matrix[ROSA responsibility matrix]
164168
endif::openshift-rosa-hcp[]

rosa_architecture/rosa_policy_service_definition/rosa-policy-understand-availability.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ include::modules/rosa-policy-failure-points.adoc[leveloffset=+1]
1212

1313
.Additional resources
1414
ifdef::openshift-rosa[]
15-
* xref:../../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-service-definition[Node lifecycle].
15+
* xref:../../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-service-definition[Node lifecycle]
1616
endif::openshift-rosa[]
1717
ifdef::openshift-rosa-hcp[]
18-
* xref:../../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-hcp-service-definition[Node lifecycle].
18+
* xref:../../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-hcp-service-definition[Node lifecycle]
1919
endif::openshift-rosa-hcp[]

rosa_planning/rosa-hcp-aws-prereqs.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include::modules/rosa-sts-aws-requirements-support-req.adoc[leveloffset=+2]
2323
//TODO OSDOCS-11789: Need to have this re-validated by SRE/Support
2424
include::modules/rosa-sts-aws-requirements-security-req.adoc[leveloffset=+2]
2525

26-
//Adding conditions around these in case the Additional resources don't get ported to HCP or have different file names / locations; keeping all included for now
26+
//Adding conditions around these in case the Additional resources don't get ported to HCP or have different file names / locations; keeping all included for now
2727
[role="_additional-resources"]
2828
[id="additional-resources_aws-security-requirements_{context}"]
2929
.Additional resources
@@ -87,4 +87,6 @@ include::modules/rosa-hcp-firewall-prerequisites.adoc[leveloffset=+2]
8787
[id="additional-resources_aws-prerequisites_{context}"]
8888
== Additional resources
8989
* xref:../rosa_architecture/rosa_policy_service_definition/rosa-sre-access.adoc#rosa-sre-access[SRE and service account access]
90-
* xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-hcp-instance-types[Instance types]
90+
ifdef::openshift-rosa-hcp[]
91+
* xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-hcp-instance-types[Instance types]
92+
endif::openshift-rosa-hcp[]

rosa_release_notes/rosa-release-notes.adoc

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ endif::openshift-rosa[]
115115
//* **Egress zero is now generally available on {product-title} clusters.** 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. For more information, see xref:../rosa_hcp/rosa-hcp-egress-zero-install.adoc#rosa-hcp-egress-zero-install[Creating a {egress-zero-title}].
116116
//endif::openshift-rosa-hcp[]
117117

118-
//Commenting this out as is repeated above, although version type is slightly different.Out of scope for Whats new pruning task. Will investigate separately.
118+
//Commenting this out as is repeated above, although version type is slightly different.Out of scope for Whats new pruning task. Will investigate separately.
119119
//* **{product-title} SDN network plugin blocks future major upgrades**
120120
//* **Initiate live migration from OpenShift SDN to OVN-Kubernetes.**
121121
//As part of the {product-title} move to OVN-Kubernetes as the only supported network plugin starting with {product-title} version 4.17, users can now initiate live migration from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin.
@@ -174,7 +174,12 @@ ifdef::openshift-rosa-hcp[]
174174

175175
* **{product-title} Graviton Arm-based instance types.** You can now use {AWS} Arm-based Graviton instance types for your workloads in {product-title} clusters created after 24 July, 2024. For more information, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-sdpolicy-aws-instance-types-graviton_rosa-hcp-instance-types[AWS Graviton Arm-based instance types].
176176
endif::openshift-rosa-hcp[]
177-
177+
// ifdef::openshift-rosa-hcp[]
178+
// * **Upgrade multiple nodes simultaneously.** You can now configure a machine pool to upgrade multiple nodes simultaneously. Two new machine pool parameters, `max-surge` and `max-unavailable`, give you greater control over how machine pool upgrades occur. For more information, see xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading {hcp-title} clusters].
179+
// endif::openshift-rosa-hcp[]
180+
ifdef::openshift-rosa-hcp[]
181+
* **{hcp-title} Graviton Arm-based instance types.** You can now use {AWS} Arm-based Graviton instance types for your workloads in {hcp-title-first} clusters created after 24 July, 2024. For more information, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-sdpolicy-aws-instance-types-graviton_rosa-hcp-instance-types[AWS Graviton Arm-based instance types].
182+
endif::openshift-rosa-hcp[]
178183
* **ROSA CLI update.** The ROSA CLI (`rosa`) was updated to a new version. For information about what has changed in this release, see the link:https://github.com/openshift/rosa/releases/tag/v1.2.42[ROSA CLI release notes]. For more information about the ROSA CLI (`rosa`), see xref:../cli_reference/rosa_cli/rosa-get-started-cli.adoc#rosa-about_rosa-getting-started-cli[About the ROSA CLI].
179184

180185
[id="rosa-q2-2024_{context}"]
@@ -200,6 +205,8 @@ ifdef::openshift-rosa[]
200205
endif::openshift-rosa[]
201206
ifdef::openshift-rosa-hcp[]
202207
* **{product-title} regions added.** {product-title} is now available in the following regions:
208+
ifdef::openshift-rosa-hcp[]
209+
* **{hcp-title} regions added.** {hcp-title-first} is now available in the following regions:
203210
+
204211
** Zurich (`eu-central-2`)
205212
** Hong Kong (`ap-east-1`)
@@ -211,6 +218,8 @@ For more information on region availabilities, see xref:../rosa_architecture/ros
211218

212219
* **Added support for external authentication providers.** You can now create clusters configured with external authentication providers, such as Microsoft Entra ID and KeyCloak. For more information, see xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-ext-auth.adoc#rosa-hcp-sts-creating-a-cluster-ext-auth[Creating {product-title} clusters with external authentication].
213220
endif::openshift-rosa-hcp[]
221+
endif::openshift-rosa-hcp[]
222+
* **Added support for external authentication providers.** You can now create clusters configured with external authentication providers, such as Microsoft Entra ID and KeyCloak. For more information, see xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-ext-auth.adoc#rosa-hcp-sts-creating-a-cluster-ext-auth[Creating ROSA with HCP clusters with external authentication].
214223

215224
* **Longer cluster names enhancement.** You can now specify a cluster name that is longer than 15 characters. For cluster names that are longer than 15 characters, you can customize the domain prefix for the cluster URL by using the `domain-prefix` flag in the ROSA CLI (`rosa`) or by selecting the **Create custom domain prefix** checkbox in the {hybrid-console}. For more information, see xref:../cli_reference/rosa_cli/rosa-manage-objects-cli.adoc#rosa-create-cluster-command_rosa-managing-objects-cli[create cluster in Managing objects with the ROSA CLI].
216225

@@ -297,13 +306,16 @@ ifdef::openshift-rosa[]
297306
* **Machine pool update.** You can now add taints to the machine pool that is automatically generated during cluster creation. You can also delete this machine pool. This new feature provides more flexibility and cost-effectiveness for cluster administrators, specifically in regards to scaling infrastructure based on changing resource requirements. For more information, see xref:../rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc#creating_a_machine_pool_rosa-managing-worker-nodes[Creating a machine pool].
298307

299308
* **{product-title} regions added.** {product-title} is now available in the following regions:
309+
ifdef::openshift-rosa-hcp[]
310+
* **ROSA regions added.** {product-title} (ROSA) is now available in the following regions:
300311
+
301312
** Spain (`eu-south-2`)
302313
** Hyderabad (`ap-south-2`)
303314
** Melbourne (`ap-southeast-4`)
304315
** Zurich (`eu-central-2`)
305316
+
306317
For more information on region availabilities, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-regions-az_rosa-service-definition[Regions and availability zones].
318+
endif::openshift-rosa-hcp[]
307319

308320
* **Documentation update.** The CLI Tools section was added to the ROSA documentation and includes more detailed information to help you fully use all of the supported CLI tools. The ROSA CLI section can now be found nested inside the CLI Tools heading. For more information, see xref:../cli_reference/index.adoc[CLI tools overview].
309321

@@ -315,6 +327,12 @@ For more information on region availabilities, see xref:../rosa_architecture/ros
315327
* **ROSA CLI update.** The ROSA CLI (`rosa`) was updated to a new version. For information about what has changed in this release, see the link:https://github.com/openshift/rosa/releases/tag/v1.2.23[ROSA CLI release notes]. For more information about the ROSA CLI (`rosa`), see xref:../cli_reference/rosa_cli/rosa-get-started-cli.adoc#rosa-about_rosa-getting-started-cli[About the ROSA CLI].
316328

317329
* **{product-title} region added.** {product-title} is now available in the United Arab Emirates (`me-central-1`) region. For more information on region availability, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-regions-az_rosa-service-definition[Regions and availability zones].
330+
ifdef::openshift-rosa-hcp[]
331+
* **ROSA region added.** {product-title} (ROSA) is now available in the United Arab Emirates (`me-central-1`) region. For more information on region availability, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-regions-az_rosa-service-definition[Regions and availability zones].
332+
endif::openshift-rosa-hcp[]
333+
include::snippets/rosa-hcp-rn.adoc[leveloffset=+1]
334+
:featureName: ROSA with HCP
335+
include::snippets/technology-preview.adoc[leveloffset=+1]
318336

319337
[id="rosa-q1-2023_{context}"]
320338
=== Q1 2023

welcome/about-hcp.adoc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ Use the following sections to find content to help you learn about and use {hcp-
3232

3333
| xref:../architecture/index.adoc#architecture-overview[Architecture overview]
3434
| xref:../backup_and_restore/application_backup_and_restore/oadp-intro.adoc#oadp-api[Back up and restore]
35+
ifdef::openshift-rosa-hcp[]
3536
| xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle]
36-
37+
endif::openshift-rosa-hcp[]
3738
| xref:../architecture/rosa-architecture-models.adoc#rosa-architecture-models[{hcp-title} architecture]
38-
|
39+
ifdef::openshift-rosa-hcp[]
3940
| xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-hcp-service-definition[{hcp-title} service definition]
40-
41+
endif::openshift-rosa-hcp[]
4142
|
4243
|
4344
| xref:../support/index.adoc#support-overview[Getting support]
@@ -59,9 +60,10 @@ Use the following sections to find content to help you learn about and use {hcp-
5960
| link:https://learn.openshift.com/?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[OpenShift Interactive Learning Portal]
6061
| xref:../storage/index.adoc#storage-overview[Storage]
6162
| xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
63+
ifdef::openshift-rosa-hcp[]
6264
| xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle]
63-
64-
|
65+
endif::openshift-rosa-hcp[]
66+
|
6567
| xref:../backup_and_restore/application_backup_and_restore/oadp-intro.adoc#oadp-api[Back up and restore]
6668
|
6769
|

0 commit comments

Comments
 (0)