Skip to content

Commit 036186d

Browse files
BraeTroutmanBraeTroutman
committed
revise and regenerate doc comments and kubebuilder validations
1 parent 2786f95 commit 036186d

7 files changed

+50
-24
lines changed

‎api/v1beta2/types.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,26 +275,27 @@ type Instance struct {
275275
MarketType MarketType `json:"marketType,omitempty"`
276276

277277
// CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
278-
// "Open" (default): The instance may make use of open Capacity Reservations that match its AZ and InstanceType
278+
// "Open": The instance may make use of open Capacity Reservations that match its AZ and InstanceType
279279
// "None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
280280
// "CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
281+
// +kubebuilder:validation:Enum="";None;CapacityReservationsOnly;Open
281282
// +optional
282283
CapacityReservationPreference CapacityReservationPreference `json:"capacityReservationPreference,omitempty"`
283284
}
284285

285286
// CapacityReservationPreference describes the preferred use of capacity reservations
286287
// of an instance
287-
// +kubebuilder:validation:Enum:=None;CapacityReservationsOnly;Open
288+
// +kubebuilder:validation:Enum:="";None;CapacityReservationsOnly;Open
288289
type CapacityReservationPreference string
289290

290291
const (
291-
// CapacityReservationPreferenceNone is a CapacityReservationPreference enum value
292+
// CapacityReservationPreferenceNone the instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
292293
CapacityReservationPreferenceNone CapacityReservationPreference = "None"
293294

294-
// CapacityReservationPreferenceOnly is a CapacityReservationPreference enum value
295+
// CapacityReservationPreferenceOnly the instance will only run if matched or targeted to a Capacity Reservation
295296
CapacityReservationPreferenceOnly CapacityReservationPreference = "CapacityReservationsOnly"
296297

297-
// CapacityReservationPreferenceOpen is a CapacityReservationPreference enum value
298+
// CapacityReservationPreferenceOpen the instance may make use of open Capacity Reservations that match its AZ and InstanceType.
298299
CapacityReservationPreferenceOpen CapacityReservationPreference = "Open"
299300
)
300301

‎config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,15 +1215,22 @@ spec:
12151215
Reservation into which the instance should be launched.
12161216
type: string
12171217
capacityReservationPreference:
1218+
allOf:
1219+
- enum:
1220+
- ""
1221+
- None
1222+
- CapacityReservationsOnly
1223+
- Open
1224+
- enum:
1225+
- ""
1226+
- None
1227+
- CapacityReservationsOnly
1228+
- Open
12181229
description: |-
12191230
CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
1220-
"Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
1231+
"Open": The instance may make use of open Capacity Reservations that match its AZ and InstanceType
12211232
"None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
12221233
"CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
1223-
enum:
1224-
- None
1225-
- CapacityReservationsOnly
1226-
- Open
12271234
type: string
12281235
ebsOptimized:
12291236
description: Indicates whether the instance is optimized for Amazon
@@ -3407,15 +3414,22 @@ spec:
34073414
Reservation into which the instance should be launched.
34083415
type: string
34093416
capacityReservationPreference:
3417+
allOf:
3418+
- enum:
3419+
- ""
3420+
- None
3421+
- CapacityReservationsOnly
3422+
- Open
3423+
- enum:
3424+
- ""
3425+
- None
3426+
- CapacityReservationsOnly
3427+
- Open
34103428
description: |-
34113429
CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
3412-
"Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
3430+
"Open": The instance may make use of open Capacity Reservations that match its AZ and InstanceType
34133431
"None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
34143432
"CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
3415-
enum:
3416-
- None
3417-
- CapacityReservationsOnly
3418-
- Open
34193433
type: string
34203434
ebsOptimized:
34213435
description: Indicates whether the instance is optimized for Amazon

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2198,15 +2198,22 @@ spec:
21982198
Reservation into which the instance should be launched.
21992199
type: string
22002200
capacityReservationPreference:
2201+
allOf:
2202+
- enum:
2203+
- ""
2204+
- None
2205+
- CapacityReservationsOnly
2206+
- Open
2207+
- enum:
2208+
- ""
2209+
- None
2210+
- CapacityReservationsOnly
2211+
- Open
22012212
description: |-
22022213
CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
2203-
"Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
2214+
"Open": The instance may make use of open Capacity Reservations that match its AZ and InstanceType
22042215
"None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
22052216
"CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
2206-
enum:
2207-
- None
2208-
- CapacityReservationsOnly
2209-
- Open
22102217
type: string
22112218
ebsOptimized:
22122219
description: Indicates whether the instance is optimized for Amazon

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,10 +647,11 @@ spec:
647647
capacityReservationPreference:
648648
description: |-
649649
CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
650-
"Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
650+
"Open" (default): The instance may make use of open Capacity Reservations that match its AZ and InstanceType
651651
"None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
652652
"CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
653653
enum:
654+
- ""
654655
- None
655656
- CapacityReservationsOnly
656657
- Open

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,10 +644,11 @@ spec:
644644
capacityReservationPreference:
645645
description: |-
646646
CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
647-
"Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
647+
"Open" (default): The instance may make use of open Capacity Reservations that match its AZ and InstanceType
648648
"None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
649649
"CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
650650
enum:
651+
- ""
651652
- None
652653
- CapacityReservationsOnly
653654
- Open

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,10 +563,11 @@ spec:
563563
capacityReservationPreference:
564564
description: |-
565565
CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
566-
"Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
566+
"Open" (default): The instance may make use of open Capacity Reservations that match its AZ and InstanceType
567567
"None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
568568
"CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
569569
enum:
570+
- ""
570571
- None
571572
- CapacityReservationsOnly
572573
- Open

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,10 +656,11 @@ spec:
656656
capacityReservationPreference:
657657
description: |-
658658
CapacityReservationPreference specifies the preference for use of Capacity Reservations by the instance. Valid values include:
659-
"Open" (default): The instance may make make use of open Capacity Reservations that match its AZ and InstanceType
659+
"Open" (default): The instance may make use of open Capacity Reservations that match its AZ and InstanceType
660660
"None": The instance may not make use of any Capacity Reservations. This is to conserve open reservations for desired workloads
661661
"CapacityReservationsOnly": The instance will only run if matched or targeted to a Capacity Reservation
662662
enum:
663+
- ""
663664
- None
664665
- CapacityReservationsOnly
665666
- Open

0 commit comments

Comments
 (0)