add support for dynamic dedicated host allocation

Co-authored-by: Jim Zimmerman <[email protected]>

Author: rvanderp3

api/v1beta2/awsmachine_types.go

@@ -47,10 +47,10 @@ const (
 type DynamicHostReleaseStrategy string
 
 const (
-	// DedicatedHostReleaseStrategyOnMachineDeletion means the dedicated host will be released when the machine is deleted.
+	// DedicatedHostReleaseStrategyOnMachineDeletion specifies the strategy to release the Dedicated Host instance when the machine is deleted.
 	DedicatedHostReleaseStrategyOnMachineDeletion = DynamicHostReleaseStrategy("on-machine-deletion")
 
-	// DedicatedHostReleaseStrategyManual means the dedicated host will be released manually by the user.
+	// DedicatedHostReleaseStrategyManual specifies the strategy to release the Dedicated Host instance manually by the user.
 	DedicatedHostReleaseStrategyManual = DynamicHostReleaseStrategy("manual")
 )
 

pkg/cloud/services/ec2/dedicatedhosts.go

@@ -35,9 +35,8 @@ import (
 // This function always allocates exactly one dedicated host per call.
 func (s *Service) AllocateDedicatedHost(ctx context.Context, spec *infrav1.DynamicHostAllocationSpec, instanceType, availabilityZone string) (string, error) {
 	s.scope.Debug("Allocating single dedicated host", "instanceType", instanceType, "availabilityZone", availabilityZone)
-	instanceFamily := extractInstanceFamily(instanceType)
 	input := &ec2.AllocateHostsInput{
-		InstanceFamily:   aws.String(instanceFamily),
+		InstanceType:   aws.String(instanceType),
 		AvailabilityZone: aws.String(availabilityZone),
 		Quantity:         aws.Int32(1), // Always allocate exactly one host
 	}
@@ -118,7 +117,7 @@ func (s *Service) DescribeDedicatedHost(ctx context.Context, hostID string) (*in
 	return hostInfo, nil
 }
 
-// convertToHostInfo converts an AWS Host to our DedicatedHostInfo struct.
+// convertToHostInfo converts an AWS Host to the DedicatedHostInfo struct.
 func (s *Service) convertToHostInfo(host types.Host) *infrav1.DedicatedHostInfo {
 	hostInfo := &infrav1.DedicatedHostInfo{
 		HostID:           aws.ToString(host.HostId),

pkg/cloud/services/ec2/instances.go

@@ -1298,7 +1298,7 @@ func (s *Service) allocateHostIfNeeded(ctx context.Context, scope *scope.Machine
 
 	// Check if a host is already allocated for this machine
 	if scope.AWSMachine.Status.AllocatedHostID != nil {
-		existingHostID := *scope.AWSMachine.Status.AllocatedHostID
+		existingHostID := aws.StringValue(scope.AWSMachine.Status.AllocatedHostID)
 		s.scope.Info("Found existing allocated host for machine", "hostID", existingHostID, "machine", scope.Name())
 
 		// Validate that the existing host is still available and compatible