Merge pull request #2614 from vr4manta/SPLAT-2169

SPLAT-2169: Added AWS dedicated host support

Author: openshift-merge-bot[bot]

machine/v1beta1/types_awsprovider.go

@@ -115,13 +115,14 @@ type AWSMachineProviderConfig struct {
 	// +optional
 	MarketType MarketType `json:"marketType,omitempty"`
 
+	// Tombstone: This field was moved into the Placement struct to belong w/ the Tenancy field due to involvement with the setting.
 	// hostPlacement configures placement on AWS Dedicated Hosts. This allows admins to assign instances to specific host
 	// for a variety of needs including for regulatory compliance, to leverage existing per-socket or per-core software licenses (BYOL),
 	// and to gain visibility and control over instance placement on a physical server.
 	// When omitted, the instance is not constrained to a dedicated host.
 	// +openshift:enable:FeatureGate=AWSDedicatedHosts
 	// +optional
-	HostPlacement *HostPlacement `json:"hostPlacement,omitempty"`
+	//HostPlacement *HostPlacement `json:"hostPlacement,omitempty"`
 }
 
 // AWSConfidentialComputePolicy represents the confidential compute configuration for the instance.
@@ -294,6 +295,7 @@ type AWSResourceReference struct {
 }
 
 // Placement indicates where to create the instance in AWS
+// +kubebuilder:validation:XValidation:rule="has(self.tenancy) && self.tenancy == 'host' ? true : !has(self.host)",message="host may only be specified when tenancy is host"
 type Placement struct {
 	// region is the region to use to create the instance
 	// +optional
@@ -303,8 +305,19 @@ type Placement struct {
 	AvailabilityZone string `json:"availabilityZone,omitempty"`
 	// tenancy indicates if instance should run on shared or single-tenant hardware. There are
 	// supported 3 options: default, dedicated and host.
+	// When set to default Runs on shared multi-tenant hardware.
+	// When dedicated Runs on single-tenant hardware (any dedicated instance hardware).
+	// When host and the host object is not provided: Runs on Dedicated Host; best-effort restart on same host.
+	// When `host` and `host` object is provided with affinity `dedicatedHost` defined: Runs on specified Dedicated Host.
 	// +optional
 	Tenancy InstanceTenancy `json:"tenancy,omitempty"`
+	// host configures placement on AWS Dedicated Hosts. This allows admins to assign instances to specific host
+	// for a variety of needs including for regulatory compliance, to leverage existing per-socket or per-core software licenses (BYOL),
+	// and to gain visibility and control over instance placement on a physical server.
+	// When omitted, the instance is not constrained to a dedicated host.
+	// +openshift:enable:FeatureGate=AWSDedicatedHosts
+	// +optional
+	Host *HostPlacement `json:"host,omitempty"`
 }
 
 // Filter is a filter used to identify an AWS resource
@@ -416,19 +429,20 @@ const (
 )
 
 // HostPlacement is the type that will be used to configure the placement of AWS instances.
-// +kubebuilder:validation:XValidation:rule="has(self.type) && self.affinity == 'DedicatedHost' ?  has(self.dedicatedHost) : !has(self.dedicatedHost)",message="dedicatedHost is required when affinity is DedicatedHost, and forbidden otherwise"
+// +kubebuilder:validation:XValidation:rule="has(self.affinity) && self.affinity == 'DedicatedHost' ? has(self.dedicatedHost) : true",message="dedicatedHost is required when affinity is DedicatedHost, and optional otherwise"
 // +union
 type HostPlacement struct {
 	// affinity specifies the affinity setting for the instance.
 	// Allowed values are AnyAvailable and DedicatedHost.
 	// When Affinity is set to DedicatedHost, an instance started onto a specific host always restarts on the same host if stopped. In this scenario, the `dedicatedHost` field must be set.
 	// 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 AnyAvailable and the `dedicatedHost` field is defined, it runs on specified Dedicated Host, but may move if stopped.
 	// +required
 	// +unionDiscriminator
 	Affinity *HostAffinity `json:"affinity,omitempty"`
 
 	// dedicatedHost specifies the exact host that an instance should be restarted on if stopped.
-	// dedicatedHost is required when 'affinity' is set to DedicatedHost, and forbidden otherwise.
+	// dedicatedHost is required when 'affinity' is set to DedicatedHost, and optional otherwise.
 	// +optional
 	// +unionMember
 	DedicatedHost *DedicatedHost `json:"dedicatedHost,omitempty"`

machine/v1beta1/zz_generated.deepcopy.go

@@ -22141,10 +22141,6 @@
           "format": "int64",
           "default": 0
         },
-        "hostPlacement": {
-          "description": "hostPlacement configures placement on AWS Dedicated Hosts. This allows admins to assign instances to specific host for a variety of needs including for regulatory compliance, to leverage existing per-socket or per-core software licenses (BYOL), and to gain visibility and control over instance placement on a physical server. 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"
@@ -23232,11 +23228,11 @@
       ],
       "properties": {
         "affinity": {
-          "description": "affinity specifies the affinity setting for the instance. Allowed values are AnyAvailable and DedicatedHost. When Affinity is set to DedicatedHost, an instance started onto a specific host always restarts on the same host if stopped. In this scenario, the `dedicatedHost` field must be set. When Affinity is set to AnyAvailable, and you stop and restart the instance, it can be restarted on any available host.",
+          "description": "affinity specifies the affinity setting for the instance. Allowed values are AnyAvailable and DedicatedHost. When Affinity is set to DedicatedHost, an instance started onto a specific host always restarts on the same host if stopped. In this scenario, the `dedicatedHost` field must be set. 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 AnyAvailable and the `dedicatedHost` field is defined, it runs on specified Dedicated Host, but may move if stopped.",
           "type": "string"
         },
         "dedicatedHost": {
-          "description": "dedicatedHost specifies the exact host that an instance should be restarted on if stopped. dedicatedHost is required when 'affinity' is set to DedicatedHost, and forbidden otherwise.",
+          "description": "dedicatedHost specifies the exact host that an instance should be restarted on if stopped. dedicatedHost is required when 'affinity' is set to DedicatedHost, and optional otherwise.",
           "$ref": "#/definitions/com.github.openshift.api.machine.v1beta1.DedicatedHost"
         }
       },
@@ -24016,12 +24012,16 @@
           "description": "availabilityZone is the availability zone of the instance",
           "type": "string"
         },
+        "host": {
+          "description": "host configures placement on AWS Dedicated Hosts. This allows admins to assign instances to specific host for a variety of needs including for regulatory compliance, to leverage existing per-socket or per-core software licenses (BYOL), and to gain visibility and control over instance placement on a physical server. When omitted, the instance is not constrained to a dedicated host.",
+          "$ref": "#/definitions/com.github.openshift.api.machine.v1beta1.HostPlacement"
+        },
         "region": {
           "description": "region is the region to use to create the instance",
           "type": "string"
         },
         "tenancy": {
-          "description": "tenancy indicates if instance should run on shared or single-tenant hardware. There are supported 3 options: default, dedicated and host.",
+          "description": "tenancy indicates if instance should run on shared or single-tenant hardware. There are supported 3 options: default, dedicated and host. When set to default Runs on shared multi-tenant hardware. When dedicated Runs on single-tenant hardware (any dedicated instance hardware). When host and the host object is not provided: Runs on Dedicated Host; best-effort restart on same host. When `host` and `host` object is provided with affinity `dedicatedHost` defined: Runs on specified Dedicated Host.",
           "type": "string"
         }
       }