Merge pull request #80254 from bmcelvee/OSDOCS-11498

OSDOCS-11498: ROSA HCP Support for EC2 IMDS Configurability

Author: bmcelvee

modules/rosa-sts-creating-a-cluster-with-customizations-cli.adoc

@@ -265,10 +265,13 @@ I: Once the cluster is installed you will need to add an Identity Provider befor
 <3> When creating the cluster, the listed `OpenShift version` options include the major, minor, and patch versions, for example `4.16.0`.
 <4> Optional: Specify 'optional' to configure all EC2 instances to use both v1 and v2 endpoints of EC2 Instance Metadata Service (IMDS). This is the default value. Specify 'required' to configure all EC2 instances to use IMDSv2 only.
 +
+ifdef::openshift-rosa[]
 [IMPORTANT]
 ====
 The Instance Metadata Service settings cannot be changed after your cluster is created.
 ====
+endif::openshift-rosa[]
++
 <5> If you have more than one set of account roles for your cluster version in your AWS account, an interactive list of options is provided.
 <6> Optional: Specify an unique identifier that is passed by {product-title} and the OpenShift installer when an account role is assumed. This option is only required for custom account roles that expect an external ID.
 <7> By default, the cluster-specific Operator role names are prefixed with the cluster name and a random 4-digit hash. You can optionally specify a custom prefix to replace `<cluster_name>-<hash>` in the role names. The prefix is applied when you create the cluster-specific Operator IAM roles. For information about the prefix, see _Defining an Operator IAM role prefix_.

modules/rosa-sts-creating-a-cluster-with-customizations-ocm.adoc

@@ -263,10 +263,12 @@ Alternatively, you can set your autoscaling preferences for the default machine
 
 . Optional: Select an EC2 Instance Metadata Service (IMDS) configuration - `optional` (default) or `required` - to enforce use of IMDSv2. For more information regarding IMDS, see link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html[Instance metadata and user data] in the AWS documentation.
 +
+ifdef::openshift-rosa[]
 [IMPORTANT]
 ====
 The Instance Metadata Service settings cannot be changed after your cluster is created.
 ====
+endif::openshift-rosa[]
 
 . Optional: Expand *Edit node labels* to add labels to your nodes. Click *Add label* to add more node labels and select *Next*.
 

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

@@ -62,6 +62,7 @@ ifdef::tf-classic,tf-hcp[]
 * Cluster name: `rosa-<6-digit-alphanumeric-string>`
 * Default AWS region for installations using the {cluster-manager-first} {hybrid-console-second}: us-east-2 (US East, Ohio)
 * Availability: Multi zone for the data plane
+* EC2 Instance Metadata Service (IMDS) is enabled and allows the use of IMDSv1 or IMDSv2 (token optional)
 endif::tf-classic,tf-hcp[]
 ifndef::tf-classic,tf-hcp[]
 * Default cluster version: Latest
@@ -70,11 +71,12 @@ ifndef::rosa-hcp[]
 endif::rosa-hcp[]
 ifdef::rosa-hcp[]
 * Default AWS region for installations using the ROSA CLI (`rosa`): Defined by your `aws` CLI configuration
+* Default EC2 IMDS endpoints (both v1 and v2) are enabled
 endif::rosa-hcp[]
 * Availability: Single zone for the data plane
 endif::tf-classic,tf-hcp[]
 ifndef::rosa-hcp,tf-hcp[]
-* Default EC2 IMDS endpoints (both v1 and v2) are enabled
+* EC2 Instance Metadata Service (IMDS) is enabled and allows the use of IMDSv1 or IMDSv2 (token optional)
 endif::rosa-hcp,tf-hcp[]
 * Monitoring for user-defined projects: Enabled
 

rosa_release_notes/rosa-release-notes.adoc

@@ -16,6 +16,8 @@ toc::[]
 [id="rosa-q3-2024_{context}"]
 === Q3 2024
 
+* **IMDSv2 support in {hcp-title}.** You can now enforce the use of the IMDSv2 endpoint for default machine pool worker nodes on new {hcp-title} clusters and for new machine pools on existing clusters. For more information, see xref:../rosa_hcp/terraform/rosa-hcp-creating-a-cluster-quickly-terraform.adoc#rosa-hcp-creating-a-cluster-quickly-terraform[Creating a default ROSA cluster using Terraform].
+
 * **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 ROSA with HCP clusters].
 
 * **{hcp-title} Graviton (ARM) 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, 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) instance types].