Added the support for capacity blocks

api/v1beta1/awscluster_conversion.go

@@ -60,6 +60,7 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
 		dst.Status.Bastion.PrivateDNSName = restored.Status.Bastion.PrivateDNSName
 		dst.Status.Bastion.PublicIPOnLaunch = restored.Status.Bastion.PublicIPOnLaunch
 		dst.Status.Bastion.CapacityReservationID = restored.Status.Bastion.CapacityReservationID
+		dst.Status.Bastion.UseCapacityBlock = restored.Status.Bastion.UseCapacityBlock
 	}
 	dst.Spec.Partition = restored.Spec.Partition
 

api/v1beta1/awsmachine_conversion.go

@@ -42,6 +42,7 @@ func (src *AWSMachine) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.PrivateDNSName = restored.Spec.PrivateDNSName
 	dst.Spec.SecurityGroupOverrides = restored.Spec.SecurityGroupOverrides
 	dst.Spec.CapacityReservationID = restored.Spec.CapacityReservationID
+	dst.Spec.UseCapacityBlock = restored.Spec.UseCapacityBlock
 	if restored.Spec.ElasticIPPool != nil {
 		if dst.Spec.ElasticIPPool == nil {
 			dst.Spec.ElasticIPPool = &infrav1.ElasticIPPool{}
@@ -104,6 +105,7 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Template.Spec.PrivateDNSName = restored.Spec.Template.Spec.PrivateDNSName
 	dst.Spec.Template.Spec.SecurityGroupOverrides = restored.Spec.Template.Spec.SecurityGroupOverrides
 	dst.Spec.Template.Spec.CapacityReservationID = restored.Spec.Template.Spec.CapacityReservationID
+	dst.Spec.Template.Spec.UseCapacityBlock = restored.Spec.Template.Spec.UseCapacityBlock
 	if restored.Spec.Template.Spec.ElasticIPPool != nil {
 		if dst.Spec.Template.Spec.ElasticIPPool == nil {
 			dst.Spec.Template.Spec.ElasticIPPool = &infrav1.ElasticIPPool{}

api/v1beta2/awsmachine_types.go

@@ -197,6 +197,11 @@ type AWSMachineSpec struct {
 	// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
 	// +optional
 	CapacityReservationID *string `json:"capacityReservationId,omitempty"`
+
+	// UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+	// If enabled, CapacityReservationID must be specified to identify the target reservation.
+	// +optional
+	UseCapacityBlock *bool `json:"useCapacityBlock,omitempty"`
 }
 
 // CloudInit defines options related to the bootstrapping systems where

api/v1beta2/awsmachine_webhook.go

@@ -66,6 +66,7 @@ func (r *AWSMachine) ValidateCreate() (admission.Warnings, error) {
 	allErrs = append(allErrs, r.validateAdditionalSecurityGroups()...)
 	allErrs = append(allErrs, r.Spec.AdditionalTags.Validate()...)
 	allErrs = append(allErrs, r.validateNetworkElasticIPPool()...)
+	allErrs = append(allErrs, r.validateInstanceMarketType()...)
 
 	return nil, aggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, allErrs)
 }
@@ -361,6 +362,14 @@ func (r *AWSMachine) validateNetworkElasticIPPool() field.ErrorList {
 	return allErrs
 }
 
+func (r *AWSMachine) validateInstanceMarketType() field.ErrorList {
+	var allErrs field.ErrorList
+	if r.Spec.UseCapacityBlock != nil && r.Spec.SpotMarketOptions != nil {
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "useCapacityBlock"), "useCapacityBlock and spotMarketOptions cannot be used together"))
+	}
+	return allErrs
+}
+
 func (r *AWSMachine) validateNonRootVolumes() field.ErrorList {
 	var allErrs field.ErrorList
 

api/v1beta2/awsmachine_webhook_test.go

@@ -217,6 +217,27 @@ func TestAWSMachineCreate(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "invalid useCapacityBlock and spotMarketOptions are specified",
+			machine: &AWSMachine{
+				Spec: AWSMachineSpec{
+					UseCapacityBlock:  aws.Bool(true),
+					SpotMarketOptions: &SpotMarketOptions{},
+					InstanceType:      "test",
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "valid useCapacityBlock is specified",
+			machine: &AWSMachine{
+				Spec: AWSMachineSpec{
+					UseCapacityBlock: aws.Bool(true),
+					InstanceType:     "test",
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "empty instance type not allowed",
 			machine: &AWSMachine{

api/v1beta2/types.go

@@ -261,6 +261,11 @@ type Instance struct {
 	// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
 	// +optional
 	CapacityReservationID *string `json:"capacityReservationId,omitempty"`
+
+	// UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+	// If enabled, CapacityReservationID must be specified to identify the target reservation.
+	// +optional
+	UseCapacityBlock *bool `json:"useCapacityBlock,omitempty"`
 }
 
 // InstanceMetadataState describes the state of InstanceMetadataOptions.HttpEndpoint and InstanceMetadataOptions.InstanceMetadataTags

config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml

@@ -1397,6 +1397,11 @@ spec:
                   type:
                     description: The instance type.
                     type: string
+                  useCapacityBlock:
+                    description: |-
+                      UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+                      If enabled, CapacityReservationID must be specified to identify the target reservation.
+                    type: boolean
                   userData:
                     description: |-
                       UserData is the raw data script passed to the instance which is run upon bootstrap.
@@ -3458,6 +3463,11 @@ spec:
                   type:
                     description: The instance type.
                     type: string
+                  useCapacityBlock:
+                    description: |-
+                      UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+                      If enabled, CapacityReservationID must be specified to identify the target reservation.
+                    type: boolean
                   userData:
                     description: |-
                       UserData is the raw data script passed to the instance which is run upon bootstrap.

config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml

@@ -2372,6 +2372,11 @@ spec:
                   type:
                     description: The instance type.
                     type: string
+                  useCapacityBlock:
+                    description: |-
+                      UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+                      If enabled, CapacityReservationID must be specified to identify the target reservation.
+                    type: boolean
                   userData:
                     description: |-
                       UserData is the raw data script passed to the instance which is run upon bootstrap.

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml

@@ -633,6 +633,10 @@ spec:
                         description: ID of resource
                         type: string
                     type: object
+                  capacityReservationId:
+                    description: CapacityReservationID specifies the target Capacity
+                      Reservation into which the instance should be launched.
+                    type: string
                   iamInstanceProfile:
                     description: |-
                       The name or the Amazon Resource Name (ARN) of the instance profile associated
@@ -857,6 +861,11 @@ spec:
                       SSHKeyName is the name of the ssh key to attach to the instance. Valid values are empty string
                       (do not use SSH keys), a valid SSH key name, or omitted (use the default SSH key name)
                     type: string
+                  useCapacityBlock:
+                    description: |-
+                      UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+                      If enabled, CapacityReservationID must be specified to identify the target reservation.
+                    type: boolean
                   versionNumber:
                     description: |-
                       VersionNumber is the version of the launch template that is applied.

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml

@@ -1098,6 +1098,11 @@ spec:
                   cloud-init has built-in support for gzip-compressed user data
                   user data stored in aws secret manager is always gzip-compressed.
                 type: boolean
+              useCapacityBlock:
+                description: |-
+                  UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+                  If enabled, CapacityReservationID must be specified to identify the target reservation.
+                type: boolean
             required:
             - instanceType
             type: object

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml

@@ -1035,6 +1035,11 @@ spec:
                           cloud-init has built-in support for gzip-compressed user data
                           user data stored in aws secret manager is always gzip-compressed.
                         type: boolean
+                      useCapacityBlock:
+                        description: |-
+                          UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+                          If enabled, CapacityReservationID must be specified to identify the target reservation.
+                        type: boolean
                     required:
                     - instanceType
                     type: object

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml

@@ -629,6 +629,10 @@ spec:
                         description: ID of resource
                         type: string
                     type: object
+                  capacityReservationId:
+                    description: CapacityReservationID specifies the target Capacity
+                      Reservation into which the instance should be launched.
+                    type: string
                   iamInstanceProfile:
                     description: |-
                       The name or the Amazon Resource Name (ARN) of the instance profile associated
@@ -853,6 +857,11 @@ spec:
                       SSHKeyName is the name of the ssh key to attach to the instance. Valid values are empty string
                       (do not use SSH keys), a valid SSH key name, or omitted (use the default SSH key name)
                     type: string
+                  useCapacityBlock:
+                    description: |-
+                      UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+                      If enabled, CapacityReservationID must be specified to identify the target reservation.
+                    type: boolean
                   versionNumber:
                     description: |-
                       VersionNumber is the version of the launch template that is applied.

exp/api/v1beta1/conversion.go

@@ -57,9 +57,16 @@ func (src *AWSMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 		dst.Spec.AWSLaunchTemplate.PrivateDNSName = restored.Spec.AWSLaunchTemplate.PrivateDNSName
 	}
 
+	if restored.Spec.AWSLaunchTemplate.CapacityReservationID != nil {
+		dst.Spec.AWSLaunchTemplate.CapacityReservationID = restored.Spec.AWSLaunchTemplate.CapacityReservationID
+	}
+
+	if restored.Spec.AWSLaunchTemplate.UseCapacityBlock != nil {
+		dst.Spec.AWSLaunchTemplate.UseCapacityBlock = restored.Spec.AWSLaunchTemplate.UseCapacityBlock
+	}
+
 	dst.Spec.DefaultInstanceWarmup = restored.Spec.DefaultInstanceWarmup
 	dst.Spec.AWSLaunchTemplate.NonRootVolumes = restored.Spec.AWSLaunchTemplate.NonRootVolumes
-
 	return nil
 }
 
@@ -109,6 +116,15 @@ func (src *AWSManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 		if restored.Spec.AWSLaunchTemplate.PrivateDNSName != nil {
 			dst.Spec.AWSLaunchTemplate.PrivateDNSName = restored.Spec.AWSLaunchTemplate.PrivateDNSName
 		}
+
+		if restored.Spec.AWSLaunchTemplate.CapacityReservationID != nil {
+			dst.Spec.AWSLaunchTemplate.CapacityReservationID = restored.Spec.AWSLaunchTemplate.CapacityReservationID
+		}
+
+		if restored.Spec.AWSLaunchTemplate.UseCapacityBlock != nil {
+			dst.Spec.AWSLaunchTemplate.UseCapacityBlock = restored.Spec.AWSLaunchTemplate.UseCapacityBlock
+		}
+
 	}
 	if restored.Spec.AvailabilityZoneSubnetType != nil {
 		dst.Spec.AvailabilityZoneSubnetType = restored.Spec.AvailabilityZoneSubnetType

exp/api/v1beta2/awsmachinepool_webhook.go

@@ -176,6 +176,7 @@ func (r *AWSMachinePool) ValidateCreate() (admission.Warnings, error) {
 	allErrs = append(allErrs, r.validateAdditionalSecurityGroups()...)
 	allErrs = append(allErrs, r.validateSpotInstances()...)
 	allErrs = append(allErrs, r.validateRefreshPreferences()...)
+	allErrs = append(allErrs, r.validateInstanceMarketType()...)
 
 	if len(allErrs) == 0 {
 		return nil, nil
@@ -188,6 +189,14 @@ func (r *AWSMachinePool) ValidateCreate() (admission.Warnings, error) {
 	)
 }
 
+func (r *AWSMachinePool) validateInstanceMarketType() field.ErrorList {
+	var allErrs field.ErrorList
+	if r.Spec.AWSLaunchTemplate.UseCapacityBlock != nil && r.Spec.AWSLaunchTemplate.SpotMarketOptions != nil {
+		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "useCapacityBlock"), "useCapacityBlock and spotMarketOptions cannot be used together"))
+	}
+	return allErrs
+}
+
 // ValidateUpdate will do any extra validation when updating a AWSMachinePool.
 func (r *AWSMachinePool) ValidateUpdate(_ runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList

exp/api/v1beta2/awsmachinepool_webhook_test.go

@@ -174,6 +174,29 @@ func TestAWSMachinePoolValidateCreate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "invalid useCapacityBlock and spotMarketOptions are specified",
+			pool: &AWSMachinePool{
+				Spec: AWSMachinePoolSpec{
+					AWSLaunchTemplate: AWSLaunchTemplate{
+						UseCapacityBlock:  aws.Bool(true),
+						SpotMarketOptions: &infrav1.SpotMarketOptions{},
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "valid useCapacityBlock is specified",
+			pool: &AWSMachinePool{
+				Spec: AWSMachinePoolSpec{
+					AWSLaunchTemplate: AWSLaunchTemplate{
+						UseCapacityBlock: aws.Bool(true),
+					},
+				},
+			},
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

exp/api/v1beta2/types.go

@@ -128,6 +128,15 @@ type AWSLaunchTemplate struct {
 	// PrivateDNSName is the options for the instance hostname.
 	// +optional
 	PrivateDNSName *infrav1.PrivateDNSName `json:"privateDnsName,omitempty"`
+
+	// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
+	// +optional
+	CapacityReservationID *string `json:"capacityReservationId,omitempty"`
+
+	// UseCapacityBlock enables usage of pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
+	// If enabled, CapacityReservationID must be specified to identify the target reservation.
+	// +optional
+	UseCapacityBlock *bool `json:"useCapacityBlock,omitempty"`
 }
 
 // Overrides are used to override the instance type specified by the launch template with multiple