Added dedicated hosts support for AWS

Author: vr4manta

pkg/operator/operator_test.go

@@ -45,13 +45,15 @@ var (
 		{Name: apifeatures.FeatureGateAzureWorkloadIdentity},
 		{Name: apifeatures.FeatureGateVSphereMultiDisk},
 		{Name: apifeatures.FeatureGateVSphereHostVMGroupZonal},
+		{Name: apifeatures.FeatureGateAWSDedicatedHosts},
 	}
 
 	enabledFeatureMap = map[string]bool{
-		"MachineAPIMigration":     true,
-		"AzureWorkloadIdentity":   true,
-		"VSphereMultiDisk":        true,
-		"VSphereHostVMGroupZonal": true,
+		"MachineAPIMigration":          true,
+		"AzureWorkloadIdentity":        true,
+		"VSphereMultiDisk":             true,
+		"VSphereHostVMGroupZonal":      true,
+		"FeatureGateAWSDedicatedHosts": true,
 	}
 )
 

pkg/webhooks/machine_webhook.go

@@ -868,6 +868,13 @@ func validateAWS(m *machinev1beta1.Machine, config *admissionConfig) (bool, []st
 		)
 	}
 
+	// Check if host affinity is set.  If so, we expect a Host ID to be set
+	if providerSpec.HostAffinity != nil {
+		if providerSpec.HostID == nil || len(*providerSpec.HostID) == 0 {
+			errs = append(errs, field.Required(field.NewPath("spec.hostID"), "hostID must be set when hostAffinity is configured"))
+		}
+	}
+
 	if len(errs) > 0 {
 		return false, warnings, errs
 	}

pkg/webhooks/machine_webhook_test.go

@@ -316,6 +316,108 @@ func TestMachineCreation(t *testing.T) {
 			},
 			expectedError: "",
 		},
+		{
+			name:         "configure host affinity with Host ID",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					InstanceType: "test",
+					HostAffinity: ptr.To("default"),
+					HostID:       ptr.To("h-09dcf61cb388b0149"),
+				},
+			},
+			expectedError: "",
+		},
+		{
+			name:         "configure host affinity with invalid affinity",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					InstanceType: "test",
+					HostAffinity: ptr.To("invalid"),
+				},
+			},
+			expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.hostID: Required value: hostID must be set when hostAffinity is configured", // true
+		},
+		{
+			name:         "configure host affinity without Host ID",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					InstanceType: "test",
+					HostAffinity: ptr.To("default"),
+				},
+			},
+			expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.hostID: Required value: hostID must be set when hostAffinity is configured", // true
+		},
+		{
+			name:         "hostID and dynamicHostAllocation are mutually exclusive",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					InstanceType: "test",
+					HostID:       ptr.To("h-1234567890abcdef0"),
+					DynamicHostAllocation: &machinev1beta1.DynamicHostAllocationSpec{
+						Release: machinev1beta1.DedicatedHostReleaseStrategyOnMachineDeletion,
+						Tags: map[string]string{
+							"Environment": "test",
+						},
+					},
+				},
+			},
+			expectedError: "validation.machine.machine.openshift.io\" denied the request: [spec.hostID: Forbidden: hostID and dynamicHostAllocation are mutually exclusive, spec.dynamicHostAllocation: Forbidden: hostID and dynamicHostAllocation are mutually exclusive]",
+		},
+		{
+			name:         "hostID alone is valid",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					InstanceType: "test",
+					HostID:       ptr.To("h-1234567890abcdef0"),
+				},
+			},
+			expectedError: "",
+		},
+		{
+			name:         "dynamicHostAllocation alone is valid",
+			platformType: osconfigv1.AWSPlatformType,
+			clusterID:    "aws-cluster",
+			providerSpecValue: &kruntime.RawExtension{
+				Object: &machinev1beta1.AWSMachineProviderConfig{
+					AMI: machinev1beta1.AWSResourceReference{
+						ID: ptr.To[string]("ami"),
+					},
+					InstanceType: "test",
+					DynamicHostAllocation: &machinev1beta1.DynamicHostAllocationSpec{
+						Release: machinev1beta1.DedicatedHostReleaseStrategyOnMachineDeletion,
+						Tags: map[string]string{
+							"Environment": "test",
+						},
+					},
+				},
+			},
+			expectedError: "",
+		},
 		{
 			name:              "with Azure and a nil provider spec value",
 			platformType:      osconfigv1.AzurePlatformType,