Skip to content

Commit 165b8e8

Browse files
committed
Added AWS dedicated host support
1 parent d394d8c commit 165b8e8

File tree

6 files changed

+53
-2
lines changed

6 files changed

+53
-2
lines changed

features/features.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,8 +772,8 @@ var (
772772
mustRegister()
773773

774774
FeatureGateAWSDedicatedHosts = newFeatureGate("AWSDedicatedHosts").
775-
reportProblemsToJiraComponent("Installer").
776-
contactPerson("faermanj").
775+
reportProblemsToJiraComponent("splat").
776+
contactPerson("rvanderp3").
777777
productScope(ocpSpecific).
778778
enhancementPR("https://github.com/openshift/enhancements/pull/1781").
779779
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).

machine/v1beta1/types_awsprovider.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,23 @@ type AWSMachineProviderConfig struct {
107107
// If this value is selected, capacityReservationID must be specified to identify the target reservation.
108108
// +optional
109109
MarketType MarketType `json:"marketType,omitempty"`
110+
111+
// HostID specifies the Dedicated Host on which the instance must be started.
112+
// This field is mutually exclusive with DynamicHostAllocation.
113+
// +kubebuilder:validation:Pattern=`^h-[0-9a-f]{17}$`
114+
// +openshift:enable:FeatureGate=AWSDedicatedHosts
115+
// +optional
116+
HostID *string `json:"hostID,omitempty"`
117+
118+
// HostAffinity specifies the dedicated host affinity setting for the instance.
119+
// When HostAffinity is set to host, an instance started onto a specific host always restarts on the same host if stopped.
120+
// When HostAffinity is set to default, and you stop and restart the instance, it can be restarted on any available host.
121+
// When HostAffinity is defined, HostID is required.
122+
// +openshift:enable:FeatureGate=AWSDedicatedHosts
123+
// +optional
124+
// +kubebuilder:validation:Enum:=default;host
125+
// +kubebuilder:default=default
126+
HostAffinity *string `json:"hostAffinity,omitempty"`
110127
}
111128

112129
// BlockDeviceMappingSpec describes a block device mapping

machine/v1beta1/zz_generated.deepcopy.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

machine/v1beta1/zz_generated.swagger_doc_generated.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openapi/generated_openapi/zz_generated.openapi.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openapi/openapi.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21970,6 +21970,14 @@
2197021970
"format": "int64",
2197121971
"default": 0
2197221972
},
21973+
"hostAffinity": {
21974+
"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.",
21975+
"type": "string"
21976+
},
21977+
"hostID": {
21978+
"description": "HostID specifies the Dedicated Host on which the instance must be started. This field is mutually exclusive with DynamicHostAllocation.",
21979+
"type": "string"
21980+
},
2197321981
"iamInstanceProfile": {
2197421982
"description": "iamInstanceProfile is a reference to an IAM role to assign to the instance",
2197521983
"$ref": "#/definitions/com.github.openshift.api.machine.v1beta1.AWSResourceReference"

0 commit comments

Comments
 (0)