Added dedicated host support

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

@@ -169,15 +169,19 @@ func (m machineAndAWSMachineAndAWSCluster) toProviderSpec() (*mapiv1beta1.AWSMac
 	}
 
 	// 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
+			*mapaProviderConfig.HostPlacement = mapiv1.HostPlacement{
+				Affinity: ptr.To(mapiv1.HostAffinityDedicatedHost),
+				DedicatedHost: &mapiv1.DedicatedHost{
+					ID: *m.awsMachine.Spec.HostID,
+				},
+			}
 		case "default":
-			*mapaProviderConfig.HostAffinity = mapiv1.HostAffinityAnyAvailable
+			*mapaProviderConfig.HostPlacement = mapiv1.HostPlacement{
+				Affinity: ptr.To(mapiv1.HostAffinityAnyAvailable),
+			}
 		default:
 			errors = append(errors, field.Invalid(fldPath.Child("hostAffinity"), m.awsMachine.Spec.HostAffinity, errUnsupportedHostAffinityType))
 		}

pkg/conversion/mapi2capi/aws.go

@@ -286,14 +286,21 @@ func (m *awsMachineAndInfra) toAWSMachine(providerSpec mapiv1beta1.AWSMachinePro
 	}
 
 	// 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.HostPlacement != nil {
+		dhPath := fldPath.Child("hostPlacement")
+		placement := providerSpec.HostPlacement
+		switch *placement.Affinity {
+		case mapiv1.HostAffinityAnyAvailable:
+			spec.HostAffinity = ptr.To("default")
+		case mapiv1.HostAffinityDedicatedHost:
+			if placement.DedicatedHost != nil {
+				spec.HostAffinity = ptr.To("host")
+				spec.HostID = ptr.To(placement.DedicatedHost.ID)
+			} else {
+				errs = append(errs, field.Required(dhPath.Child("dedicatedHost"), "affinity DedicatedHost requires dedicatedHost field to be set"))
+			}
+		default:
+		}
 	}
 
 	if providerSpec.CapacityReservationID != "" {