Added AWS dedicated host support

Author: vr4manta

features/features.go

@@ -772,8 +772,8 @@ var (
 					mustRegister()
 
 	FeatureGateAWSDedicatedHosts = newFeatureGate("AWSDedicatedHosts").
-					reportProblemsToJiraComponent("Installer").
-					contactPerson("faermanj").
+					reportProblemsToJiraComponent("splat").
+					contactPerson("rvanderp3").
 					productScope(ocpSpecific).
 					enhancementPR("https://github.com/openshift/enhancements/pull/1781").
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).

machine/v1beta1/types_awsprovider.go

@@ -107,6 +107,22 @@ type AWSMachineProviderConfig struct {
 	// If this value is selected, capacityReservationID must be specified to identify the target reservation.
 	// +optional
 	MarketType MarketType `json:"marketType,omitempty"`
+
+	// hostID specifies the Dedicated Host on which the instance must be started.
+	// This field is mutually exclusive with DynamicHostAllocation.
+	// +kubebuilder:validation:Pattern=`^h-[0-9a-f]{17}$`
+	// +kubebuilder:validation:MaxLength=19
+	// +openshift:enable:FeatureGate=AWSDedicatedHosts
+	// +optional
+	HostID *string `json:"hostID,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.
+	// +openshift:enable:FeatureGate=AWSDedicatedHosts
+	// +optional
+	HostAffinity *HostAffinity `json:"hostAffinity,omitempty"`
 }
 
 // BlockDeviceMappingSpec describes a block device mapping
@@ -355,3 +371,22 @@ const (
 	// When set to CapacityBlock the instance utilizes pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
 	MarketTypeCapacityBlock MarketType = "CapacityBlock"
 )
+
+// HostAffinity describes the host affinity of an EC2 Instance
+// +kubebuilder:validation:Enum:=host;default;""
+// +kubebuilder:default=""
+type HostAffinity string
+
+const (
+	// HostAffinityUnspecified is a HostAffinity enum value
+	// When set to default the instance is put on a host using the AWS default logic.
+	HostAffinityUnspecified HostAffinity = ""
+
+	// HostAffinityDefault is a HostAffinity enum value
+	// When set to default the instance is put on a host using the AWS default logic.
+	HostAffinityDefault HostAffinity = "default"
+
+	// HostAffinityHost is a HostAffinity enum value
+	// When set to host the instance runs on the specified host.
+	HostAffinityHost HostAffinity = "host"
+)

machine/v1beta1/zz_generated.deepcopy.go

@@ -21970,6 +21970,14 @@
           "format": "int64",
           "default": 0
         },
+        "hostAffinity": {
+          "description": "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.",
+          "type": "string"
+        },
+        "hostID": {
+          "description": "hostID specifies the Dedicated Host on which the instance must be started. This field is mutually exclusive with DynamicHostAllocation.",
+          "type": "string"
+        },
         "iamInstanceProfile": {
           "description": "iamInstanceProfile is a reference to an IAM role to assign to the instance",
           "$ref": "#/definitions/com.github.openshift.api.machine.v1beta1.AWSResourceReference"