diff --git a/machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-supported-features-aws.adoc b/machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-supported-features-aws.adoc index dc45176bfd79..cba6b6668a18 100644 --- a/machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-supported-features-aws.adoc +++ b/machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-supported-features-aws.adoc @@ -25,24 +25,18 @@ include::modules/cpms-changing-aws-instance-type.adoc[leveloffset=+1] //Assigning machines to placement groups by using machine sets include::modules/machineset-aws-existing-placement-group.adoc[leveloffset=+1] -//Machine sets that enable the Amazon EC2 Instance Metadata Service -include::modules/machineset-imds-options.adoc[leveloffset=+1] +//Creating machines that use the Amazon EC2 Instance Metadata Service +include::modules/machineset-creating-imds-options.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources * xref:../../../machine_configuration/mco-update-boot-images.adoc#mco-update-boot-images[Boot image management] -//Creating machines that use the Amazon EC2 Instance Metadata Service -include::modules/machineset-creating-imds-options.adoc[leveloffset=+2] - //Configuring storage throughput for gp3 drives include::modules/machineset-creating-gp3-throughput.adoc[leveloffset=+1] -//Machine sets that deploy machines as Dedicated Instances -include::modules/machineset-dedicated-instances.adoc[leveloffset=+1] - //Creating Dedicated Instances by using machine sets -include::modules/machineset-creating-dedicated-instances.adoc[leveloffset=+2] +include::modules/machineset-creating-dedicated-instances.adoc[leveloffset=+1] //Configuring Capacity Reservation by using machine sets include::modules/machineset-capacity-reservation.adoc[leveloffset=+1,tag=!compute] diff --git a/machine_management/creating_machinesets/creating-machineset-aws.adoc b/machine_management/creating_machinesets/creating-machineset-aws.adoc index 2026ce94e50c..4f8c0932c4da 100644 --- a/machine_management/creating_machinesets/creating-machineset-aws.adoc +++ b/machine_management/creating_machinesets/creating-machineset-aws.adoc @@ -27,24 +27,18 @@ include::modules/machineset-label-gpu-autoscaler.adoc[leveloffset=+1] //Assigning machines to placement groups by using machine sets include::modules/machineset-aws-existing-placement-group.adoc[leveloffset=+1] -//Machine sets that enable the Amazon EC2 Instance Metadata Service -include::modules/machineset-imds-options.adoc[leveloffset=+1] +//Creating machines that use the Amazon EC2 Instance Metadata Service +include::modules/machineset-creating-imds-options.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources * xref:../../machine_configuration/mco-update-boot-images.adoc#mco-update-boot-images[Boot image management] -//Creating machines that use the Amazon EC2 Instance Metadata Service -include::modules/machineset-creating-imds-options.adoc[leveloffset=+2] - //Configuring storage throughput for gp3 drives include::modules/machineset-creating-gp3-throughput.adoc[leveloffset=+1] -//Machine sets that deploy machines as Dedicated Instances -include::modules/machineset-dedicated-instances.adoc[leveloffset=+1] - //Creating Dedicated Instances by using machine sets -include::modules/machineset-creating-dedicated-instances.adoc[leveloffset=+2] +include::modules/machineset-creating-dedicated-instances.adoc[leveloffset=+1] //Machine sets that deploy machines as Spot Instances include::modules/machineset-non-guaranteed-instance.adoc[leveloffset=+1] diff --git a/modules/cpms-changing-aws-instance-type.adoc b/modules/cpms-changing-aws-instance-type.adoc index 368e6a072298..3ac6c6c9ef3b 100644 --- a/modules/cpms-changing-aws-instance-type.adoc +++ b/modules/cpms-changing-aws-instance-type.adoc @@ -3,57 +3,52 @@ // * scalability_and_performance/recommended-performance-scale-practices/recommended-control-plane-practices.adoc // * machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-aws.adoc -ifeval::["{context}" == "recommended-control-plane-practices"] -:scale-host: -endif::[] -ifeval::["{context}" == "cpmso-supported-features-aws"] -:cpmso-config-options-aws: -endif::[] - :_mod-docs-content-type: PROCEDURE [id="cpms-changing-aws-instance-type_{context}"] -= Changing the Amazon Web Services instance type by using a control plane machine set += Changing the {aws-full} instance type by using a control plane machine set [role="_abstract"] -You can change the {aws-first} instance type that your control plane machines use by updating the specification in the control plane machine set custom resource (CR). - -ifdef::scale-host[] -** For clusters that use the default `RollingUpdate` update strategy, the Operator automatically propagates the changes to your control plane configuration. - -** For clusters that are configured to use the `OnDelete` update strategy, you must replace your control plane machines manually. -endif::scale-host[] +If you need more resources for your control plane machines, you can change the {aws-first} instance type that they use. +To change the instance type, you update the instance type value in the control plane machine set custom resource (CR). .Prerequisites +* You have access to the {oc-first} as a user with administrator privileges. + * Your {aws-short} cluster uses a control plane machine set. .Procedure -ifdef::scale-host[] . Edit your control plane machine set CR by running the following command: + [source,terminal] ---- -$ oc --namespace openshift-machine-api edit controlplanemachineset.machine.openshift.io cluster +$ oc edit controlplanemachineset.machine.openshift.io cluster --namespace openshift-machine-api ---- -endif::scale-host[] -. Edit the following line under the `providerSpec` field: +. Update the CR to implement your configuration changes: + [source,yaml] ---- -providerSpec: - value: - ... - instanceType: +apiVersion: machine.openshift.io/v1 +kind: ControlPlaneMachineSet +# ... +spec: + template: + machines_v1beta1_machine_openshift_io: + spec: + providerSpec: + value: + instanceType: ---- -** ``: Specifies a larger {aws-short} instance type with the same base as the previous selection. For example, you can change `m6i.xlarge` to `m6i.2xlarge` or `m6i.4xlarge`. ++ +where `` specifies a larger {aws-short} instance type with the same base. +For example, you can change this value from `m6i.xlarge` to `m6i.2xlarge` or `m6i.4xlarge`. -. Save your changes. +. Save your changes and exit the object specification. ++ +When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured update strategy. -ifeval::["{context}" == "recommended-control-plane-practices"] -:!scale-host: -endif::[] -ifeval::["{context}" == "cpmso-supported-features-aws"] -:!cpmso-config-options-aws: -endif::[] +** For clusters that use the default `RollingUpdate` update strategy, the Operator automatically propagates the changes to your control plane configuration. + +** For clusters that are configured to use the `OnDelete` update strategy, you must replace your control plane machines manually. diff --git a/modules/machineset-aws-existing-placement-group.adoc b/modules/machineset-aws-existing-placement-group.adoc index 19f1629c2869..ec9babe02428 100644 --- a/modules/machineset-aws-existing-placement-group.adoc +++ b/modules/machineset-aws-existing-placement-group.adoc @@ -11,59 +11,113 @@ endif::[] [id="machineset-aws-existing-placement-group_{context}"] = Assigning machines to placement groups for Elastic Fabric Adapter instances by using machine sets -You can configure a machine set to deploy machines on link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html[Elastic Fabric Adapter] (EFA) instances within an existing AWS placement group. +[role="_abstract"] +To improve network performance, you can configure a machine set to deploy machines on link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html[Elastic Fabric Adapter] (EFA) instances within an AWS placement group. -EFA instances do not require placement groups, and you can use placement groups for purposes other than configuring an EFA. This example uses both to demonstrate a configuration that can improve network performance for machines within the specified placement group. +EFA instances do not require placement groups, and you can use placement groups for purposes other than configuring an EFA. +This example uses both to demonstrate a configuration that can improve network performance for machines within the specified placement group. .Prerequisites +* You have access to the {oc-first} as a user with administrator privileges. + * You created a placement group in the AWS console. + [NOTE] ==== Ensure that the link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html#limitations-placement-groups[rules and limitations] for the type of placement group that you create are compatible with your intended use case. ifdef::cpmso[] -The control plane machine set spreads the control plane machines across multiple failure domains when possible. To use placement groups for the control plane, you must use a placement group type that can span multiple Availability Zones. +The control plane machine set spreads the control plane machines across multiple failure domains when possible. +To use placement groups for the control plane, you must use a placement group type that can span multiple Availability Zones. endif::cpmso[] ==== .Procedure -. In a text editor, open the YAML file for an existing machine set or create a new one. - -. Edit the following lines under the `providerSpec` field: +ifdef::cpmso[] +. Edit your control plane machine set custom resource (CR) by running the following command: + -[source,yaml] +[source,terminal] +---- +$ oc edit controlplanemachineset.machine.openshift.io cluster --namespace openshift-machine-api ---- +endif::cpmso[] + ifndef::cpmso[] -apiVersion: machine.openshift.io/v1beta1 -kind: MachineSet +. In a text editor, open an existing machine set custom resource (CR) or create a new one. endif::cpmso[] + +. Update the CR to implement your configuration changes: ++ +[source,yaml] +---- ifdef::cpmso[] apiVersion: machine.openshift.io/v1 kind: ControlPlaneMachineSet +# ... +spec: + template: + machines_v1beta1_machine_openshift_io: + spec: + providerSpec: + value: + instanceType: + networkInterfaceType: + placement: + availabilityZone: + region: + placementGroupName: + placementGroupPartition: endif::cpmso[] +ifndef::cpmso[] +apiVersion: machine.openshift.io/v1beta1 +kind: MachineSet # ... spec: template: spec: providerSpec: value: - instanceType: # <1> - networkInterfaceType: EFA # <2> + instanceType: + networkInterfaceType: EFA placement: - availabilityZone: # <3> - region: # <4> - placementGroupName: # <5> - placementGroupPartition: # <6> -# ... + availabilityZone: + region: + placementGroupName: + placementGroupPartition: +endif::cpmso[] ---- -<1> Specify an instance type that link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html#efa-instance-types[supports EFAs]. -<2> Specify the `EFA` network interface type. -<3> Specify the zone, for example, `us-east-1a`. -<4> Specify the region, for example, `us-east-1`. -<5> Specify the name of the existing AWS placement group to deploy machines in. -<6> Optional: Specify the partition number of the existing AWS placement group to deploy machines in. ++ +where: + +``:: +Specifies an instance type that link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html#efa-instance-types[supports EFAs]. + +``:: +Specifies the network interface type. +To use an EFA, set this value to `EFA`. + +``:: +Specifies the zone; for example, `us-east-1a`. + +``:: +Specifies the region; for example, `us-east-1`. + +``:: +Specifies the name of the existing AWS placement group to deploy machines in. + +``:: +Optional: Specifies the partition number of the existing AWS placement group to deploy machines in. + +. Save your changes and exit the object specification. +ifdef::cpmso[] ++ +When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured update strategy. + +** For clusters that use the default `RollingUpdate` update strategy, the Operator automatically propagates the changes to your control plane configuration. + +** For clusters that are configured to use the `OnDelete` update strategy, you must replace your control plane machines manually. +endif::cpmso[] .Verification @@ -71,7 +125,7 @@ spec: ** The placement group field has the value that you specified for the `placementGroupName` parameter in the machine set. -** The partition number field has the value that you specified for the `placementGroupPartition` parameter in the machine set. +** If you specified a partition number, the partition number field has the value that you specified for the `placementGroupPartition` parameter in the machine set. ** The interface type field indicates that it uses an EFA. diff --git a/modules/machineset-capacity-reservation.adoc b/modules/machineset-capacity-reservation.adoc index 32d4dfcc92eb..f1b793db89a1 100644 --- a/modules/machineset-capacity-reservation.adoc +++ b/modules/machineset-capacity-reservation.adoc @@ -20,15 +20,14 @@ endif::[] :_mod-docs-content-type: PROCEDURE [id="machineset-capacity-reservation_{context}"] -ifdef::azure[= Configuring Capacity Reservation by using machine sets] -ifdef::aws[= Configuring Capacity Reservations by using machine sets] += Configuring Capacity Reservations by using machine sets -{product-title} version {product-version} and later supports +[role="_abstract"] +You can configure a machine set to deploy machines on any available resources that match the parameters of a capacity request that you define by using ifdef::azure[on-demand Capacity Reservation with Capacity Reservation groups on {azure-full} clusters.] ifdef::aws[Capacity Reservations on {aws-full} clusters, including On-Demand Capacity Reservations and Capacity Blocks for ML.] -You can configure a machine set to deploy machines on any available resources that match the parameters of a capacity request that you define. -These parameters specify the +The parameters you define specify the ifdef::azure[VM size,] ifdef::aws[instance type,] region, and number of instances that you want to reserve. @@ -54,77 +53,104 @@ endif::azure[] * You have access to the cluster with `cluster-admin` privileges. * You installed the {oc-first}. ifdef::azure[] -* You created a Capacity Reservation group. +* You have created a Capacity Reservation group. For more information, see link:https://learn.microsoft.com/en-us/azure/virtual-machines/capacity-reservation-create[Create a Capacity Reservation] in the {azure-full} documentation. endif::azure[] ifdef::aws[] -* You purchased an On-Demand Capacity Reservation or Capacity Block for ML. +* You have purchased an On-Demand Capacity Reservation or Capacity Block for ML. For more information, see link:https://docs.aws.amazon.com/en_us/AWSEC2/latest/UserGuide/capacity-reservation-overview.html[On-Demand Capacity Reservations and Capacity Blocks for ML] in the {aws-short} documentation. endif::aws[] .Procedure -. In a text editor, open the YAML file for an existing machine set or create a new one. +tag::controlplane[] +. Edit your control plane machine set custom resource (CR) by running the following command: ++ +[source,terminal] +---- +$ oc edit controlplanemachineset.machine.openshift.io cluster --namespace openshift-machine-api +---- +end::controlplane[] + +tag::compute[] +. In a text editor, open an existing machine set custom resource (CR) or create a new one. +end::compute[] -. Edit the following section under the `providerSpec` field: +. Update the CR to implement your configuration changes: + --- -.Sample configuration [source,yaml] ---- tag::compute[] apiVersion: machine.openshift.io/v1beta1 kind: MachineSet -end::compute[] -tag::controlplane[] -apiVersion: machine.openshift.io/v1 -kind: ControlPlaneMachineSet -end::controlplane[] # ... spec: template: -tag::compute[] spec: providerSpec: value: ifdef::azure[] - capacityReservationGroupID: # <1> + capacityReservationGroupID: endif::azure[] ifdef::aws[] - capacityReservationId: # <1> - marketType: # <2> + capacityReservationId: + marketType: endif::aws[] end::compute[] tag::controlplane[] +apiVersion: machine.openshift.io/v1 +kind: ControlPlaneMachineSet +# ... +spec: + template: machines_v1beta1_machine_openshift_io: spec: providerSpec: value: ifdef::azure[] - capacityReservationGroupID: # <1> + capacityReservationGroupID: endif::azure[] ifdef::aws[] - capacityReservationId: # <1> - marketType: # <2> + capacityReservationId: + marketType: endif::aws[] end::controlplane[] # ... ---- -<1> Specify the ID of the -ifdef::azure[Capacity Reservation group] -ifdef::aws[Capacity Block for ML or On-Demand Capacity Reservation] -that you want the machine set to deploy machines on. ++ +where: +ifdef::azure[] + +``:: +Specifies the ID of the Capacity Reservation group that you want the machine set to deploy machines on. +endif::azure[] ifdef::aws[] -<2> Specify the market type to use. +``:: +Specifies the ID of the Capacity Block for ML or On-Demand Capacity Reservation that you want the machine set to deploy machines on. + +``:: +Specifies the market type to use. The following values are valid: ++ +-- `CapacityBlock`:: Use this market type with Capacity Blocks for ML. `OnDemand`:: Use this market type with On-Demand Capacity Reservations. tag::compute[] `Spot`:: Use this market type with Spot Instances. This option is not compatible with Capacity Reservations. end::compute[] -endif::[] -- +endif::aws[] + +. Save your changes and exit the object specification. +tag::controlplane[] ++ +When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured update strategy. + +** For clusters that use the default `RollingUpdate` update strategy, the Operator automatically propagates the changes to your control plane configuration. + +** For clusters that are configured to use the `OnDelete` update strategy, you must replace your control plane machines manually. +end::controlplane[] .Verification @@ -148,9 +174,7 @@ tag::compute[] where `` is the name of the compute machine set. end::compute[] + -In the output, verify that the characteristics of the listed machines match the parameters of your -ifdef::azure[Capacity Reservation.] -ifdef::aws[Capacity Reservation.] +In the output, verify that the characteristics of the listed machines match the parameters of your Capacity Reservation. ifeval::["{context}" == "creating-machineset-azure"] :!azure: diff --git a/modules/machineset-creating-dedicated-instances.adoc b/modules/machineset-creating-dedicated-instances.adoc index c7323b10af05..3e8c2c52873c 100644 --- a/modules/machineset-creating-dedicated-instances.adoc +++ b/modules/machineset-creating-dedicated-instances.adoc @@ -3,19 +3,86 @@ // * machine_management/creating_machinesets/creating-machineset-aws.adoc // * machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-aws.adoc +ifeval::["{context}" == "cpmso-supported-features-aws"] +:cpmso: +endif::[] + :_mod-docs-content-type: PROCEDURE [id="machineset-creating-dedicated-instance_{context}"] = Creating Dedicated Instances by using machine sets -You can run a machine that is backed by a Dedicated Instance by using Machine API integration. Set the `tenancy` field in your machine set YAML file to launch a Dedicated Instance on AWS. +[role="_abstract"] +You can configure a machine set to deploy machines as Dedicated Instances that run in a virtual private cloud (VPC) on hardware that only a single customer can use. +To change use Dedicated Instances, you update the placement tenancy value in the machine set custom resource (CR). + +{aws-first} Dedicated Instances are EC2 instances that are physically isolated at the host hardware level. +This isolation applies to instances that a single payer account owns even if the instances belong to different {aws-short} accounts. + +Public tenancy is the default tenancy. +Instances with public tenancy run on shared hardware and can share hardware with Dedicated Instances that belong to the same {aws-short} account. + +.Prerequisites + +* You have access to the {oc-first} as a user with administrator privileges. .Procedure -* Specify a dedicated tenancy under the `providerSpec` field: +ifdef::cpmso[] +. Edit your control plane machine set custom resource (CR) by running the following command: ++ +[source,terminal] +---- +$ oc edit controlplanemachineset.machine.openshift.io cluster --namespace openshift-machine-api +---- +endif::cpmso[] + +ifndef::cpmso[] +. In a text editor, open an existing machine set custom resource (CR) or create a new one. +endif::cpmso[] + +. Update the CR to implement your configuration changes: + [source,yaml] ---- -providerSpec: - placement: - tenancy: dedicated +ifdef::cpmso[] +apiVersion: machine.openshift.io/v1 +kind: ControlPlaneMachineSet +# ... +spec: + template: + machines_v1beta1_machine_openshift_io: + spec: + providerSpec: + value: + placement: + tenancy: dedicated +endif::cpmso[] +ifndef::cpmso[] +apiVersion: machine.openshift.io/v1beta1 +kind: MachineSet +# ... +spec: + template: + spec: + providerSpec: + value: + placement: + tenancy: dedicated +endif::cpmso[] ---- ++ +To use Dedicated Instances, set the `placement.tenancy` parameter value to `dedicated`. + +. Save your changes and exit the object specification. +ifdef::cpmso[] ++ +When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured update strategy. + +** For clusters that use the default `RollingUpdate` update strategy, the Operator automatically propagates the changes to your control plane configuration. + +** For clusters that are configured to use the `OnDelete` update strategy, you must replace your control plane machines manually. +endif::cpmso[] + +ifeval::["{context}" == "cpmso-supported-features-aws"] +:!cpmso: +endif::[] diff --git a/modules/machineset-creating-imds-options.adoc b/modules/machineset-creating-imds-options.adoc index 03e78c0cca71..877226f3c943 100644 --- a/modules/machineset-creating-imds-options.adoc +++ b/modules/machineset-creating-imds-options.adoc @@ -3,23 +3,96 @@ // * machine_management/creating_machinesets/creating-machineset-aws.adoc // * machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-aws.adoc +ifeval::["{context}" == "cpmso-supported-features-aws"] +:cpmso: +endif::[] + :_mod-docs-content-type: PROCEDURE [id="machineset-creating-imds-options_{context}"] -= Configuring IMDS by using machine sets += Configuring the {aws-short} EC2 Instance Metadata Service by using machine sets + +[role="_abstract"] +You can use machine sets to create machines that use the version of the Amazon EC2 Instance Metadata Service (IMDS) that meets the security requirements of your organization. +You can specify whether to require the use of IMDSv2 by adding or editing the value of `metadataServiceOptions.authentication` in the machine set. -You can specify whether to require the use of IMDSv2 by adding or editing the value of `metadataServiceOptions.authentication` in the machine set YAML file for your machines. +Machine sets can create machines that allow the use of both IMDSv1 and link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html[IMDSv2] or machines that require the use of IMDSv2. + +[IMPORTANT] +==== +Before configuring a machine set to create machines that require IMDSv2, ensure that any workloads that interact with the AWS metadata service support IMDSv2. +==== .Prerequisites * To use IMDSv2, your AWS cluster must have been created with {product-title} version 4.7 or later. +ifndef::cpmso[] ++ +[NOTE] +==== +To use IMDSv2 on {aws-short} clusters that were created with {product-title} version 4.6 or earlier, you must update your boot image. +For more information, see "Boot image management". +==== +endif::cpmso[] .Procedure -* Add or edit the following lines under the `providerSpec` field: + +ifdef::cpmso[] +. Edit your control plane machine set custom resource (CR) by running the following command: ++ +[source,terminal] +---- +$ oc edit controlplanemachineset.machine.openshift.io cluster --namespace openshift-machine-api +---- +endif::cpmso[] + +ifndef::cpmso[] +. In a text editor, open an existing machine set custom resource (CR) or create a new one. +endif::cpmso[] + +. Update the CR to implement your configuration changes: + [source,yaml] ---- -providerSpec: - value: - metadataServiceOptions: - authentication: Required <1> +ifdef::cpmso[] +apiVersion: machine.openshift.io/v1 +kind: ControlPlaneMachineSet +# ... +spec: + template: + machines_v1beta1_machine_openshift_io: + spec: + providerSpec: + value: + imetadataServiceOptions: + authentication: Required +endif::cpmso[] +ifndef::cpmso[] +apiVersion: machine.openshift.io/v1beta1 +kind: MachineSet +# ... +spec: + template: + spec: + providerSpec: + value: + metadataServiceOptions: + authentication: Required +endif::cpmso[] ---- -<1> To require IMDSv2, set the parameter value to `Required`. To allow the use of both IMDSv1 and IMDSv2, set the parameter value to `Optional`. If no value is specified, both IMDSv1 and IMDSv2 are allowed. ++ +To require IMDSv2, set the `metadataServiceOptions.authentication` parameter value to `Required`. +To allow the use of both IMDSv1 and IMDSv2, set the parameter value to `Optional`. +If you do not specify a value, machines that the machine set creates allow the use of both IMDSv1 and IMDSv2. + +. Save your changes and exit the object specification. +ifdef::cpmso[] ++ +When you save an update to the control plane machine set, the Control Plane Machine Set Operator updates the control plane machines according to your configured update strategy. + +** For clusters that use the default `RollingUpdate` update strategy, the Operator automatically propagates the changes to your control plane configuration. + +** For clusters that are configured to use the `OnDelete` update strategy, you must replace your control plane machines manually. +endif::cpmso[] + +ifeval::["{context}" == "cpmso-supported-features-aws"] +:!cpmso: +endif::[] diff --git a/modules/machineset-dedicated-instances.adoc b/modules/machineset-dedicated-instances.adoc deleted file mode 100644 index 61067ec05278..000000000000 --- a/modules/machineset-dedicated-instances.adoc +++ /dev/null @@ -1,12 +0,0 @@ -// Module included in the following assemblies: -// -// * machine_management/creating_machinesets/creating-machineset-aws.adoc -// * machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-aws.adoc - -:_mod-docs-content-type: CONCEPT -[id="machineset-dedicated-instance_{context}"] -= Machine sets that deploy machines as Dedicated Instances - -You can create a machine set running on AWS that deploys machines as Dedicated Instances. Dedicated Instances run in a virtual private cloud (VPC) on hardware that is dedicated to a single customer. These Amazon EC2 instances are physically isolated at the host hardware level. The isolation of Dedicated Instances occurs even if the instances belong to different AWS accounts that are linked to a single payer account. However, other instances that are not dedicated can share hardware with Dedicated Instances if they belong to the same AWS account. - -Instances with either public or dedicated tenancy are supported by the Machine API. Instances with public tenancy run on shared hardware. Public tenancy is the default tenancy. Instances with dedicated tenancy run on single-tenant hardware. diff --git a/modules/machineset-imds-options.adoc b/modules/machineset-imds-options.adoc deleted file mode 100644 index d8ad07849eb1..000000000000 --- a/modules/machineset-imds-options.adoc +++ /dev/null @@ -1,32 +0,0 @@ -// Module included in the following assemblies: -// -// * machine_management/creating_machinesets/creating-machineset-aws.adoc -// * machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-aws.adoc - -ifeval::["{context}" == "cpmso-supported-features-aws"] -:cpmso: -endif::[] - -:_mod-docs-content-type: CONCEPT -[id="machineset-imds-options_{context}"] -= Machine set options for the Amazon EC2 Instance Metadata Service - -You can use machine sets to create machines that use a specific version of the Amazon EC2 Instance Metadata Service (IMDS). Machine sets can create machines that allow the use of both IMDSv1 and link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html[IMDSv2] or machines that require the use of IMDSv2. - -[NOTE] -==== -To use IMDSv2 on AWS clusters that were created with {product-title} version 4.6 or earlier, you must update your boot image. For more information, see "Boot image management". -==== - -ifndef::cpmso[] -To deploy new compute machines with your preferred IMDS configuration, create a compute machine set YAML file with the appropriate values. You can also edit an existing machine set to create new machines with your preferred IMDS configuration when the machine set is scaled up. -endif::cpmso[] - -[IMPORTANT] -==== -Before configuring a machine set to create machines that require IMDSv2, ensure that any workloads that interact with the AWS metadata service support IMDSv2. -==== - -ifeval::["{context}" == "cpmso-supported-features-aws"] -:!cpmso: -endif::[]