diff --git a/modules/creating-a-machine-pool-cli-win-li.adoc b/modules/creating-a-machine-pool-cli-win-li.adoc new file mode 100644 index 000000000000..a5b4d38b03a0 --- /dev/null +++ b/modules/creating-a-machine-pool-cli-win-li.adoc @@ -0,0 +1,100 @@ +// Module included in the following assemblies: +// +// * rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc + +:_mod-docs-content-type: PROCEDURE +[id="creating_a_machine_pools_cli_win_li_{context}"] += Creating a machine pool with AWS Windows License Included enabled using the {rosa-cli} + +[role="_abstract"] +If you are using {VirtProductName} on a {product-title} cluster running Windows VMs you need to be license-compliant with Microsoft Windows in AWS. The hosts (AMD64 bare metal EC2 instances) running these VMs must be enabled with AWS EC2 Windows License Included (LI). + +[IMPORTANT] +==== +Enabling AWS Windows LI on a machine pool applies the associated licensing fees on that specific machine pool. This includes billing for the full vCPU allocation of each AWS Windows LI enabled host in your {product-title} cluster. Windows LI enabled machine pools will also deny vCPU over-allocation on {VirtProductName} VMs. For more information, see link:https://aws.amazon.com/windows/resources/licensing//[Microsoft Licensing on AWS]. +==== + +.Prerequisites + +* You installed and configured the {rosa-cli} version 1.2.58 or above. +* You logged in to your Red{nbsp}Hat account using the {rosa-cli}. +* You created a {product-title} cluster version 4.19 or above. +* You identified an AMD64 bare-metal EC2 instance type to use {VirtProductName}. For more, see link:https://aws.amazon.com/ec2/instance-types/#Bare_metal[Amazon EC2 Instance Types]. +* You are in compliance with Microsoft and AWS requirements for the Microsoft licenses and associated costs. + + +.Procedure + +* To add a Windows LI enabled machine pool to a {product-title} cluster, create the machine pool with the following definitions: ++ +[source,terminal] +---- +$ rosa create machinepool --cluster= \ + --name= \ + --replicas= \ + --instance-type= \ + --type= +---- +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 {product-title} 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 an AMD64 bare-metal instance type to enable Windows LI. For example, you can use `m5zn.metal` or `i3.metal`. You cannot change the instance type for a machine pool after the pool is created. +`--type=`:: You must specify `Windows` to ensure the machine pool is created with Windows LI enabled. ++ +The following command creates a Windows LI enabled machine pool called `mymachinepool` using the `m5zn.metal` instance type with 1 compute node replica: ++ +[source,terminal] +---- +$ rosa create machinepool --cluster=mycluster --name=mymachinepool --type=Windows --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' +---- + +.Verification + +. List the available machine pools on your cluster by running the following command: ++ +[source,terminal] +---- +$ rosa list machinepools --cluster= +---- ++ +. Describe the information of a specific machine pool in your cluster: ++ +[source,terminal] +---- +$ rosa describe machinepool --cluster= --machinepool=mymachinepool +---- ++ +The output has the image type set to `Windows` as shown in the following example: ++ +.Example output +[source,terminal] +---- +ID: mymachinepool +Cluster ID: mycluster +Autoscaling: No +Desired replicas: 1 +Current replicas: 1 +Instance type: m5zn.metal +Image type: Windows +Labels: +Tags: +Taints: +Availability zone: us-east-1a +Subnet: +Disk Size: 300 GiB +Version: 4.19.18 +EC2 Metadata Http Tokens: optional +Autorepair: Yes +Tuning configs: +Kubelet configs: +Additional security group IDs: +Node drain grace period: +---- diff --git a/modules/creating-a-machine-pool-cli.adoc b/modules/creating-a-machine-pool-cli.adoc index a32b6db9e2fe..f36f711725ee 100644 --- a/modules/creating-a-machine-pool-cli.adoc +++ b/modules/creating-a-machine-pool-cli.adoc @@ -200,22 +200,6 @@ 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}]. -+ -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. -+ -[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]. -==== -//endif::openshift-rosa-hcp[] Uncomment this out once HCP split occurs - .Verification You can list all machine pools on your cluster or describe individual machine pools. @@ -262,6 +246,7 @@ Cluster ID: 27iimopsg1mge0m81l0sqivkne2qu6dr Autoscaling: Yes Replicas: 3-6 Instance type: m5.xlarge +Image type: Windows Labels: app=db, tier=backend Taints: Availability zones: us-east-1a, us-east-1b, us-east-1c diff --git a/modules/creating-a-machine-pool-ocm.adoc b/modules/creating-a-machine-pool-ocm.adoc index d55a01618233..a2641240aeb3 100644 --- a/modules/creating-a-machine-pool-ocm.adoc +++ b/modules/creating-a-machine-pool-ocm.adoc @@ -59,7 +59,17 @@ endif::openshift-rosa,openshift-rosa-hcp[] ==== You cannot change the instance type for a machine pool after the pool is created. ==== - +//Commenting out until this HCP feature is available in the OCM UI +//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 (AMD64 bare-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. +//+ +//You can only select this option when the host cluster is a {product-title} cluster version 4.19 and later and the instance type is AMD64 bare metal EC2. +//+ +//[IMPORTANT] +//==== +//Enabling AWS Windows LI on a machine pool applies the associated licensing fees on that specific machine pool. This includes billing for the full vCPU allocation of each AWS Windows LI enabled host in your {product-title} cluster. Windows LI enabled machine pools will also deny vCPU over-allocation on {VirtProductName} VMs. For more information, see link:https://aws.amazon.com/windows/resources/licensing//[Microsoft Licensing on AWS]. +//==== +//endif::openshift-rosa-hcp[] . 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. ifdef::openshift-dedicated[] diff --git a/modules/rosa-release-notes-Q4-2025.adoc b/modules/rosa-release-notes-Q4-2025.adoc index 43662ac99fb7..6c0d15d29f62 100644 --- a/modules/rosa-release-notes-Q4-2025.adoc +++ b/modules/rosa-release-notes-Q4-2025.adoc @@ -5,11 +5,15 @@ [id="rosa-q4-2025_{context}"] = Q4 2025 -[role="_abstract"] +[role="_abstract"] The following items were added during the fourth quarter of 2025. +ifdef::openshift-rosa-hcp[] +* **AWS Windows License Included now available for {product-title}.** You can now add a Windows License Included enabled machine pool to a {product-title} cluster. For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html/cluster_administration/managing-compute-nodes-using-machine-pools#creating_a_machine_pools_cli_win_li[Creating a machine pool with AWS Windows License Included enabled using the {rosa-cli}]. +endif::openshift-rosa-hcp[] + * ** AWS GovCloud.** -The Amazon Web Services (AWS) GovCloud service is now available and for use by federal and government agencies, or by commercial organizations and Federal Information Security Modernization Act (FISMA) R&D Universities supporting a government contract or in the process of bidding on a government contract such as a request for proposal (RFP) or request for information (RFI) pre-bid stage. +The Amazon Web Services (AWS) GovCloud service is now available and for use by federal and government agencies, or by commercial organizations and Federal Information Security Modernization Act (FISMA) R&D Universities supporting a government contract or in the process of bidding on a government contract such as a request for proposal (RFP) or request for information (RFI) pre-bid stage. For more information, see ifdef::openshift-rosa-hcp[] link: @@ -25,7 +29,6 @@ ifdef::openshift-rosa-hcp[] {product-title} now supports ImageDigestMirrorSets (IDMS), enabling clusters to redirect image pulls to a private, mirrored registry. This critical enhancement means customers in air-gapped or restricted networks can host their own mirrors for third-party images while satisfying strict security and compliance requirements. For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html-single/images/index#images-registry-mirroring_image-configuration-hcp[Image registry mirroring for {product-title}]. endif::openshift-rosa-hcp[] - * **New version of {product-title} available.** {product-title} version 4.20 is now available for new clusters. ifdef::openshift-rosa-hcp[] diff --git a/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc b/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc index 84acaace0276..3bd26dd96698 100644 --- a/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc +++ b/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc @@ -40,6 +40,7 @@ include::modules/creating-a-machine-pool-ocm.adoc[leveloffset=+2] include::modules/creating-a-machine-pool-cli.adoc[leveloffset=+2] //OSDOCS-14809: Adding a separate module about Capacity Reservations. This might be a temporary solution since this module largely reuses content from modules/creating-a-machine-pool-cli.adoc. We might consider restructuring content from these 2 modules to meet ContentX and DITA migration goals. ifdef::openshift-rosa-hcp[] +include::modules/creating-a-machine-pool-cli-win-li.adoc[leveloffset=+2] include::modules/creating-a-machine-pool-cli-capres.adoc[leveloffset=+2] endif::openshift-rosa-hcp[]