Added dedicated host support for AWS

Author: vr4manta

manifests/0000_30_cluster-api_01_credentials-request.yaml

@@ -25,6 +25,7 @@ spec:
       - ec2:DescribeDhcpOptions
       - ec2:DescribeImages
       - ec2:DescribeInstances
+      - ec2:DescribeInstanceTypes
       - ec2:DescribeInternetGateways
       - ec2:DescribeSecurityGroups
       - ec2:DescribeSubnets

pkg/conversion/capi2mapi/aws.go

@@ -41,11 +41,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.
@@ -167,6 +168,25 @@ func (m machineAndAWSMachineAndAWSCluster) toProviderSpec() (*mapiv1beta1.AWSMac
 		MarketType:              mapiAWSMarketType,
 	}
 
+	// Dedicated host support
+	if m.awsMachine.Spec.HostAffinity != nil {
+		switch *m.awsMachine.Spec.HostAffinity {
+		case "host":
+			mapaProviderConfig.HostPlacement = &mapiv1beta1.HostPlacement{
+				Affinity: ptr.To(mapiv1beta1.HostAffinityDedicatedHost),
+				DedicatedHost: &mapiv1beta1.DedicatedHost{
+					ID: *m.awsMachine.Spec.HostID,
+				},
+			}
+		case "default":
+			mapaProviderConfig.HostPlacement = &mapiv1beta1.HostPlacement{
+				Affinity: ptr.To(mapiv1beta1.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 {

pkg/conversion/mapi2capi/aws.go

@@ -281,6 +281,8 @@ func (m *awsMachineAndInfra) toAWSMachine(providerSpec mapiv1beta1.AWSMachinePro
 		SpotMarketOptions: convertAWSSpotMarketOptionsToCAPI(providerSpec.SpotMarketOptions),
 		Subnet:            convertAWSResourceReferenceToCAPI(providerSpec.Subnet),
 		Tenancy:           string(providerSpec.Placement.Tenancy),
+		HostAffinity:      convertAWSHostAffinityToCAPI(providerSpec.HostPlacement),
+		HostID:            convertAWSHostIDToCAPI(providerSpec.HostPlacement),
 		// UncompressedUserData: Not used in OpenShift.
 		MarketType: capiAWSMarketType,
 	}
@@ -478,6 +480,38 @@ func awsMachineToAWSMachineTemplate(awsMachine *awsv1.AWSMachine, name string, n
 
 //////// Conversion helpers
 
+func convertAWSHostAffinityToCAPI(placement *mapiv1beta1.HostPlacement) *string {
+	if placement != nil {
+		switch *placement.Affinity {
+		case mapiv1beta1.HostAffinityAnyAvailable:
+			return ptr.To("default")
+		case mapiv1beta1.HostAffinityDedicatedHost:
+			return ptr.To("host")
+		default:
+			return nil
+		}
+	}
+
+	return nil
+}
+
+func convertAWSHostIDToCAPI(placement *mapiv1beta1.HostPlacement) *string {
+	if placement != nil {
+		switch *placement.Affinity {
+		case mapiv1beta1.HostAffinityAnyAvailable:
+			return nil
+		case mapiv1beta1.HostAffinityDedicatedHost:
+			if placement.DedicatedHost != nil {
+				return ptr.To(placement.DedicatedHost.ID)
+			}
+		default:
+			return nil
+		}
+	}
+
+	return nil
+}
+
 func convertAWSAMIResourceReferenceToCAPI(fldPath *field.Path, amiRef mapiv1beta1.AWSResourceReference) (awsv1.AMIReference, *field.Error) {
 	if amiRef.ARN != nil {
 		return awsv1.AMIReference{}, field.Invalid(fldPath.Child("arn"), amiRef.ARN, "unable to convert AMI ARN reference. Not supported in CAPI")