wip: perform IPI installation on AWS dedicated hosts

Author: rvanderp3

pkg/asset/machines/aws/awsmachines.go

@@ -33,6 +33,8 @@ type MachineInput struct {
 	PublicIP       bool
 	PublicIpv4Pool string
 	Ignition       *capa.Ignition
+	HostAffinity   string
+	HostID         string
 }
 
 // GenerateMachines returns manifests and runtime objects to provision the control plane (including bootstrap, if applicable) nodes using CAPI.
@@ -103,6 +105,8 @@ func GenerateMachines(clusterID string, in *MachineInput) ([]*asset.RuntimeFile,
 				Subnet:               subnet,
 				PublicIP:             ptr.To(in.PublicIP),
 				AdditionalTags:       in.Tags,
+				HostID:               ptr.To(in.HostID),
+				HostAffinity:         ptr.To(in.HostAffinity),
 				RootVolume: &capa.Volume{
 					Size:          int64(mpool.EC2RootVolume.Size),
 					Type:          capa.VolumeType(mpool.EC2RootVolume.Type),

pkg/types/aws/platform.go

@@ -14,6 +14,11 @@ const (
 	VolumeTypeGp2 = "gp2"
 	// VolumeTypeGp3 is the type of EBS volume for General Purpose SSD gp3.
 	VolumeTypeGp3 = "gp3"
+
+	// HostAffinityDefault if an instance is stopped and restarted, it can be restarted on any available host.
+	HostAffinityDefault = "default"
+	// HostAffinityHost an instance started onto a specific host always restarts on the same host if stopped.
+	HostAffinityHost    = "host"
 )
 
 // Platform stores all the global configuration that all machinesets
@@ -128,6 +133,18 @@ type Platform struct {
 	// +default="Disabled"
 	// +kubebuilder:validation:Enum="Enabled";"Disabled"
 	UserProvisionedDNS dns.UserProvisionedDNS `json:"userProvisionedDNS,omitempty"`
+
+	// HostAffinity specifies the dedicated host affinity setting for the instance.
+	// When hostAffinity is set to host, an instance started onto a specific host always restarts on the same host if stopped.
+	// When hostAffinity is set to default, and you stop and restart the instance, it can be restarted on any available host.
+	// When HostAffinity is defined, HostID is required.
+	// +optional
+	// +kubebuilder:validation:Enum:=default;host
+	HostAffinity string `json:"hostAffinity,omitempty"`
+
+	// HostID specifies the dedicated host on which the instance should be started.
+	// +optional
+	HostID string `json:"hostID,omitempty"`	
 }
 
 // ServiceEndpoint store the configuration for services to

pkg/types/aws/validation/platform.go

@@ -60,6 +60,18 @@ func ValidatePlatform(p *aws.Platform, publish types.PublishingStrategy, cm type
 		allErrs = append(allErrs, ValidateMachinePool(p, p.DefaultMachinePlatform, fldPath.Child("defaultMachinePlatform"))...)
 	}
 
+	if p.HostAffinity != "" {
+		if p.HostID == "" {
+			allErrs = append(allErrs, field.Required(fldPath.Child("hostID"), "hostID must be specified when hostAffinity is set"))
+		}
+		switch p.HostAffinity {
+			case aws.HostAffinityDefault:
+			case aws.HostAffinityHost:
+			default:
+				allErrs = append(allErrs, field.Invalid(fldPath.Child("hostAffinity"), p.HostAffinity, "hostAffinity must be either default or host"))
+		}			
+	}
+
 	return allErrs
 }
 

pkg/types/aws/validation/platform_test.go

@@ -87,6 +87,26 @@ func TestValidatePlatform(t *testing.T) {
 			},
 			expected: `^test-path\.serviceEndpoints\[0\]\.url: Invalid value: "(.*)": no path or request parameters must be provided, "/\?foo=some" was provided$`,
 		},
+		{
+			name: "valid dedicated hosts",
+			platform: &aws.Platform{
+				HostAffinity: "default",
+				HostID: "h-09dcf61cb388b0149",
+			},
+		},
+		{
+			name: "invalid dedicated hosts - invalid affinity type",
+			platform: &aws.Platform{
+				HostAffinity: "unknown",
+				HostID: "h-09dcf61cb388b0149",
+			},
+		},
+		{
+			name: "invalid dedicated hosts - missing hostID",
+			platform: &aws.Platform{
+				HostAffinity: "host",				
+			},
+		},
 		{
 			name: "valid url for service endpoint",
 			platform: &aws.Platform{