Added dedicated host support for AWS

Author: vr4manta

pkg/conversion/capi2mapi/aws.go

@@ -37,11 +37,12 @@ var (
 )
 
 const (
-	errUnsupportedCAPATenancy     = "unable to convert tenancy, unknown value"
-	errUnsupportedCAPAMarketType  = "unable to convert market type, unknown value"
-	errUnsupportedHTTPTokensState = "unable to convert httpTokens state, unknown value" //nolint:gosec // This is an error message, not a credential
-	defaultIdentityName           = "default"
-	defaultCredentialsSecretName  = "aws-cloud-credentials" //#nosec G101 -- False positive, not actually a credential.
+	errUnsupportedCAPATenancy      = "unable to convert tenancy, unknown value"
+	errUnsupportedCAPAMarketType   = "unable to convert market type, unknown value"
+	errUnsupportedHTTPTokensState  = "unable to convert httpTokens state, unknown value" //nolint:gosec // This is an error message, not a credential
+	defaultIdentityName            = "default"
+	defaultCredentialsSecretName   = "aws-cloud-credentials" //#nosec G101 -- False positive, not actually a credential.
+	errUnsupportedHostAffinityType = "unable to convert hostAffinity, unknown value"
 )
 
 // machineAndAWSMachineAndAWSCluster stores the details of a Cluster API Machine and AWSMachine and AWSCluster.
@@ -156,6 +157,21 @@ func (m machineAndAWSMachineAndAWSCluster) toProviderSpec() (*mapiv1.AWSMachineP
 		MarketType:              mapiAWSMarketType,
 	}
 
+	// Dedicated host support
+	if m.awsMachine.Spec.HostID != nil {
+		mapaProviderConfig.HostID = m.awsMachine.Spec.HostID
+	}
+	if m.awsMachine.Spec.HostAffinity != nil {
+		switch *m.awsMachine.Spec.HostAffinity {
+		case "host":
+			*mapaProviderConfig.HostAffinity = mapiv1.HostAffinityHost
+		case "default":
+			*mapaProviderConfig.HostAffinity = mapiv1.HostAffinityAnyAvailable
+		default:
+			errors = append(errors, field.Invalid(fldPath.Child("hostAffinity"), m.awsMachine.Spec.HostAffinity, errUnsupportedHostAffinityType))
+		}
+	}
+
 	secretRef, errs := handleAWSIdentityRef(fldPath.Child("identityRef"), m.awsCluster.Spec.IdentityRef)
 
 	if len(errs) > 0 {
@@ -525,6 +541,15 @@ func handleUnsupportedAWSMachineFields(fldPath *field.Path, spec awsv1.AWSMachin
 		errs = append(errs, field.Invalid(fldPath.Child("privateDNSName"), spec.PrivateDNSName, "privateDNSName is not supported"))
 	}
 
+	// Unsupported new fields in newer CAPA versions
+	if spec.ElasticIPPool != nil {
+		errs = append(errs, field.Invalid(fldPath.Child("elasticIpPool"), spec.ElasticIPPool, "elasticIpPool is not supported"))
+	}
+
+	if spec.CapacityReservationPreference != "" {
+		errs = append(errs, field.Invalid(fldPath.Child("capacityReservationPreference"), spec.CapacityReservationPreference, "capacityReservationPreference is not supported"))
+	}
+
 	if spec.Ignition != nil {
 		if spec.Ignition.Proxy != nil {
 			// Ignition proxy is not configurable in MAPI. Not required for our use case.

pkg/conversion/mapi2capi/aws.go

@@ -285,6 +285,17 @@ func (m *awsMachineAndInfra) toAWSMachine(providerSpec mapiv1.AWSMachineProvider
 		MarketType: capiAWSMarketType,
 	}
 
+	// Dedicated host support
+	if providerSpec.HostID != nil {
+		spec.HostID = providerSpec.HostID
+	}
+	if providerSpec.HostAffinity != nil {
+		spec.HostAffinity = ptr.To(string(*providerSpec.HostAffinity))
+	}
+	if providerSpec.HostAffinity != nil && providerSpec.HostID == nil {
+		errs = append(errs, field.Invalid(fldPath.Child("hostAffinity"), providerSpec.HostAffinity, "hostAffinity requires hostID to be set"))
+	}
+
 	if providerSpec.CapacityReservationID != "" {
 		spec.CapacityReservationID = &providerSpec.CapacityReservationID
 	}