From 347f1bdf4d0499e43453a130f955dd544f794018 Mon Sep 17 00:00:00 2001 From: AedinC Date: Mon, 8 Sep 2025 08:51:54 +0100 Subject: [PATCH] Rebasing. --- modules/creating-a-machine-pool-cli.adoc | 44 +++++++++++++++++----- modules/creating-a-machine-pool-ocm.adoc | 9 ++++- rosa_release_notes/rosa-release-notes.adoc | 6 +-- 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/modules/creating-a-machine-pool-cli.adoc b/modules/creating-a-machine-pool-cli.adoc index 795ce269bc08..de22cb77d71f 100644 --- a/modules/creating-a-machine-pool-cli.adoc +++ b/modules/creating-a-machine-pool-cli.adoc @@ -194,21 +194,45 @@ I: Machine pool 'mymachinepool' created successfully on hosted cluster 'mycluste endif::openshift-rosa-hcp[] I: To view all machine pools, run 'rosa list machinepools -c mycluster' ---- - -//ifdef::openshift-rosa-hcp[] Uncomment this out once HCP split occurs -* To add a Windows License Included enabled machine pool to a {product-title} cluster, see link:https://access.redhat.com/articles/7096903[AWS Windows License Included for {product-title}]. +ifdef::openshift-rosa-hcp[] +* If you are using {VirtProductName} on a {product-title} cluster, you might want to run Windows VMs. In order to be license-compliant with Microsoft Windows in AWS, the hosts (metal EC2 instances) running these VMs must be enabled with AWS EC2 Windows License Included. + -Windows License Included enabled machine pools can only be created when the following criteria is met: - -** The host cluster is a {product-title} cluster. -** The instance type is bare metal EC2. +To add a Windows Licence Included enabled machine pool to a {product-title} cluster, create the machine pool with the following instance type and labels. + [IMPORTANT] ==== -AWS Windows License Included for {product-title} is a Technology Preview feature only. Technology Preview features are not supported with Red{nbsp}Hat production service level agreements (SLAs) and might not be functionally complete. Red{nbsp}Hat does not recommend using them in production. These features provide early access to upcoming product features, enabling customers to test functionality and provide feedback during the development process. - -For more information about the support scope of Red{nbsp}Hat Technology Preview features, see link:https://access.redhat.com/support/offerings/techpreview/[Technology Preview Features Support Scope]. +You can only add a Windows Licence Included enabled machine pool to a {product-title} cluster version 4.19 and later, created in the `us-west-2` region, and using a bare metal EC2 instance type. ==== ++ +endif::openshift-rosa-hcp[] +[source,terminal] +---- +$ rosa create machinepool --cluster= \ + --name= \ + --replicas= \ + --instance-type= \ + --labels==,= +---- +where: + +`--name=`:: Specifies the name of the machine pool. Replace `` with the name of your machine pool. +`--replicas=`:: Specifies the number of compute nodes to provision. If you deployed ROSA using a single availability zone, this defines the number of compute nodes to provision to the machine pool for the zone. If you deployed your cluster using multiple availability zones, this defines the number of compute nodes to provision in total across all zones and the count must be a multiple of 3. The `--replicas` argument is required when autoscaling is not configured. +`--instance-type=`:: Specifies the instance type. You can only select a bare metal instance type to enable Windows LI.(x86-64). +`--labels==,=`:: Defines the labels for the machine pool. Replace `=,=` with a comma-delimited list of key-value pairs, for example `--labels=key1=value1,key2=value2`. You must include the `--type=win-li` label to ensure the machine pool is created with Windows LI enabled. ++ +The following example creates a machine pool with Windows License LI enabled called `mymachinepool` that uses the `bm5zn.metal` instance type and has 1 compute node replica: ++ +[source,terminal] +---- +$ rosa create machinepool --cluster=mycluster --name=mymachinepool --type win-li --instance-type m5zn.metal --replicas 1 +---- ++ +.Example output +[source,terminal] +---- +I: Machine pool 'mymachinepool' created successfully on cluster 'mycluster' +I: To view all machine pools, run 'rosa list machinepools -c mycluster' +---- //endif::openshift-rosa-hcp[] Uncomment this out once HCP split occurs .Verification diff --git a/modules/creating-a-machine-pool-ocm.adoc b/modules/creating-a-machine-pool-ocm.adoc index 4b08ff2a8350..d059c484290a 100644 --- a/modules/creating-a-machine-pool-ocm.adoc +++ b/modules/creating-a-machine-pool-ocm.adoc @@ -57,9 +57,16 @@ endif::openshift-rosa,openshift-rosa-hcp[] ==== You cannot change the instance type for a machine pool after the pool is created. ==== - +ifdef::openshift-rosa-hcp[] +. Optional: If you are using {VirtProductName} on a {product-title} cluster, you might want to run Windows VMs. In order to be license-compliant with Microsoft Windows in AWS, the hosts (metal EC2 instances) running these VMs must be enabled with AWS EC2 Windows License Included. To enable the machine pool for AWS Windows License Included, select the *Enable machine pool for AWS Windows License Included* checkbox. ++ +[IMPORTANT] +==== +You can only select this option when the host cluster is a {product-title} cluster version 4.19 and later, the instance type is bare metal EC2, and the region is `us-west-2`. +==== . Optional: Configure autoscaling for the machine pool: .. Select *Enable autoscaling* to automatically scale the number of machines in your machine pool to meet the deployment needs. +endif::openshift-rosa-hcp[] ifdef::openshift-dedicated[] + [NOTE] diff --git a/rosa_release_notes/rosa-release-notes.adoc b/rosa_release_notes/rosa-release-notes.adoc index b81aecf8daec..3856db1b8c86 100644 --- a/rosa_release_notes/rosa-release-notes.adoc +++ b/rosa_release_notes/rosa-release-notes.adoc @@ -17,10 +17,10 @@ toc::[] === Q3 2025 ifdef::openshift-rosa-hcp[] -* **Shared VPC for ROSA with HCP clusters.** You can create {product-title} clusters in shared, centrally-managed AWS virtual private clouds (VPCs). For more information, see xref:../rosa_hcp/rosa-hcp-shared-vpc-config.adoc#rosa-hcp-shared-vpc-config[Configuring a shared VPC for ROSA with HCP clusters]. -endif::openshift-rosa-hcp[] +* **AWS Windows Licence Included now available for {product-title}.** You can now add a Windows Licence Included enabled machine pool to a {product-title} cluster. For more information, see xref:../rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc#creating_machine_pools_cli[Managing compute nodes]. + +* **Shared VPC for ROSA with HCP clusters.** You can create {product-title} clusters in shared, centrally-managed AWS virtual private clouds (VPCs). For more information, see xref:../rosa_hcp/rosa-hcp-shared-vpc-config.adoc#rosa-hcp-shared-vpc-config[Configuring a shared VPC for {product-title} clusters]. -ifdef::openshift-rosa-hcp[] * **Deprecated `--private-link` flags for {product-title} clusters**. Architectural changes to the ROSA CLI 1.2.55 make networking more flexible for {product-title} clusters. The `--private-link` flag previously used when creating a {product-title} cluster is now deprecated in favor of the `--private` and `--default-ingress-private` flags. Now, users can choose to have a combination of a public or private API with a public or private ingress. For more information, see xref:../rosa_hcp/rosa-hcp-aws-private-creating-cluster.adoc#rosa-hcp-aws-private-create-cluster_rosa-hcp-aws-private-creating-cluster[Creating a private cluster on {product-title}]. endif::openshift-rosa-hcp[]