Added AWS dedicated host support

Author: vr4manta

features/features.go

@@ -752,8 +752,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

@@ -114,6 +114,12 @@ type AWSMachineProviderConfig struct {
 	// If this value is selected, capacityReservationID must be specified to identify the target reservation.
 	// +optional
 	MarketType MarketType `json:"marketType,omitempty"`
+
+	// hostPlacement configures placement on AWS Dedicated Hosts.
+	// When omitted, the instance is not constrained to a dedicated host.
+	// +openshift:enable:FeatureGate=AWSDedicatedHosts
+	// +optional
+	HostPlacement *HostPlacement `json:"hostPlacement,omitempty"`
 }
 
 // AWSConfidentialComputePolicy represents the confidential compute configuration for the instance.
@@ -393,3 +399,46 @@ const (
 	// When set to CapacityBlock the instance utilizes pre-purchased compute capacity (capacity blocks) with AWS Capacity Reservations.
 	MarketTypeCapacityBlock MarketType = "CapacityBlock"
 )
+
+type HostPlacement struct {
+	// affinity specifies the affinity setting for the instance.
+	// When Affinity is set to DedicatedHost, an instance started onto a specific host always restarts on the same host if stopped. This setting also requires the configuration of DedicatedHost.
+	// When Affinity is set to AnyAvailable, and you stop and restart the instance, it can be restarted on any available host.
+	// When Affinity is set to DedicatedHost, dedicated field is required.
+	// The default value is AnyAvailable
+	// +kubebuilder:default=AnyAvailable
+	// +openshift:enable:FeatureGate=AWSDedicatedHosts
+	// +optional
+	Affinity *HostAffinity `json:"affinity,omitempty"`
+
+	// dedicated specifies a particular dedicated host when required by affinity set to DedicatedHost.
+	// Must be omitted when hostAffinity is "AnyAvailable".
+	// +openshift:enable:FeatureGate=AWSDedicatedHosts
+	// +optional
+	Dedicated *DedicatedHost `json:"dedicated,omitempty"`
+}
+
+// HostAffinity selects how an instance should be placed on AWS Dedicated Hosts.
+// +kubebuilder:validation:Enum:=DedicatedHost;AnyAvailable
+type HostAffinity string
+
+const (
+	// HostAffinityAnyAvailable lets the platform select any available dedicated host.
+	HostAffinityAnyAvailable HostAffinity = "AnyAvailable"
+
+	// HostAffinityDedicatedHost requires specifying a particular host via dedicatedHost.host.hostID.
+	HostAffinityDedicatedHost HostAffinity = "DedicatedHost"
+)
+
+type DedicatedHost struct {
+	// id identifies the AWS Dedicated Host on which the instance must run.
+	// The value must start with "h-" followed by 17 lowercase hexadecimal characters (0-9 and a-f).
+	// Minimum length is 19 characters.
+	// Maximum length is 19 characters.
+	// +kubebuilder:validation:XValidation:rule="self.matches('^h-[0-9a-f]{17}$')",message="hostID must start with 'h-' followed by 17 lowercase hexadecimal characters (0-9 and a-f)"
+	// +kubebuilder:validation:MinLength=19
+	// +kubebuilder:validation:MaxLength=19
+	// +openshift:enable:FeatureGate=AWSDedicatedHosts
+	// +required
+	ID string `json:"id,omitempty"`
+}

machine/v1beta1/zz_generated.deepcopy.go

@@ -22655,6 +22655,10 @@
           "format": "int64",
           "default": 0
         },
+        "hostPlacement": {
+          "description": "hostPlacement configures placement on AWS Dedicated Hosts. When omitted, the instance is not constrained to a dedicated host.",
+          "$ref": "#/definitions/com.github.openshift.api.machine.v1beta1.HostPlacement"
+        },
         "iamInstanceProfile": {
           "description": "iamInstanceProfile is a reference to an IAM role to assign to the instance",
           "$ref": "#/definitions/com.github.openshift.api.machine.v1beta1.AWSResourceReference"
@@ -23242,6 +23246,18 @@
         }
       }
     },
+    "com.github.openshift.api.machine.v1beta1.DedicatedHost": {
+      "type": "object",
+      "required": [
+        "id"
+      ],
+      "properties": {
+        "id": {
+          "description": "id identifies the AWS Dedicated Host on which the instance must run. The value must start with \"h-\" followed by 17 lowercase hexadecimal characters (0-9 and a-f). Minimum length is 19 characters. Maximum length is 19 characters.",
+          "type": "string"
+        }
+      }
+    },
     "com.github.openshift.api.machine.v1beta1.DiskEncryptionSetParameters": {
       "description": "DiskEncryptionSetParameters is the disk encryption set properties",
       "type": "object",
@@ -23712,6 +23728,19 @@
         }
       }
     },
+    "com.github.openshift.api.machine.v1beta1.HostPlacement": {
+      "type": "object",
+      "properties": {
+        "affinity": {
+          "description": "affinity specifies the affinity setting for the instance. When Affinity is set to DedicatedHost, an instance started onto a specific host always restarts on the same host if stopped. This setting also requires the configuration of DedicatedHost. When Affinity is set to AnyAvailable, and you stop and restart the instance, it can be restarted on any available host. When Affinity is set to DedicatedHost, dedicated field is required. The default value is AnyAvailable",
+          "type": "string"
+        },
+        "dedicated": {
+          "description": "dedicated specifies a particular dedicated host when required by affinity set to DedicatedHost. Must be omitted when hostAffinity is \"AnyAvailable\".",
+          "$ref": "#/definitions/com.github.openshift.api.machine.v1beta1.DedicatedHost"
+        }
+      }
+    },
     "com.github.openshift.api.machine.v1beta1.Image": {
       "description": "Image is a mirror of azure sdk compute.ImageReference",
       "type": "object",