Skip to content

Commit 913796f

Browse files
Merge pull request #137795 from ttsuuubasa/dra-binding-conditions-beta
DRA Device Binding Conditions: graduate to beta Kubernetes-commit: 0d28578de14fce641a39d6415d2068e1f39283a4
2 parents 629d7f3 + 51abad8 commit 913796f

9 files changed

Lines changed: 54 additions & 54 deletions

resource/v1/generated.proto

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

resource/v1/types.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ type Device struct {
380380
// If set to true, the scheduler will set the ResourceClaim.Status.Allocation.NodeSelector
381381
// to match the node where the allocation was made.
382382
//
383-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
383+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
384384
// feature gates.
385385
//
386386
// +optional
@@ -396,7 +396,7 @@ type Device struct {
396396
//
397397
// The conditions must be a valid condition type string.
398398
//
399-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
399+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
400400
// feature gates.
401401
//
402402
// +optional
@@ -414,7 +414,7 @@ type Device struct {
414414
//
415415
// The conditions must be a valid condition type string.
416416
//
417-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
417+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
418418
// feature gates.
419419
//
420420
// +optional
@@ -1559,7 +1559,7 @@ type AllocationResult struct {
15591559
// AllocationTimestamp stores the time when the resources were allocated.
15601560
// This field is not guaranteed to be set, in which case that time is unknown.
15611561
//
1562-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
1562+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
15631563
// feature gate.
15641564
//
15651565
// +optional
@@ -1667,7 +1667,7 @@ type DeviceRequestAllocationResult struct {
16671667
// BindingConditions contains a copy of the BindingConditions
16681668
// from the corresponding ResourceSlice at the time of allocation.
16691669
//
1670-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
1670+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
16711671
// feature gates.
16721672
//
16731673
// +optional
@@ -1680,7 +1680,7 @@ type DeviceRequestAllocationResult struct {
16801680
// BindingFailureConditions contains a copy of the BindingFailureConditions
16811681
// from the corresponding ResourceSlice at the time of allocation.
16821682
//
1683-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
1683+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
16841684
// feature gates.
16851685
//
16861686
// +optional

resource/v1/types_swagger_doc_generated.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var map_AllocationResult = map[string]string{
4646
"": "AllocationResult contains attributes of an allocated resource.",
4747
"devices": "Devices is the result of allocating devices.",
4848
"nodeSelector": "NodeSelector defines where the allocated resources are available. If unset, they are available everywhere.",
49-
"allocationTimestamp": "AllocationTimestamp stores the time when the resources were allocated. This field is not guaranteed to be set, in which case that time is unknown.\n\nThis is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gate.",
49+
"allocationTimestamp": "AllocationTimestamp stores the time when the resources were allocated. This field is not guaranteed to be set, in which case that time is unknown.\n\nThis is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gate.",
5050
}
5151

5252
func (AllocationResult) SwaggerDoc() map[string]string {
@@ -122,9 +122,9 @@ var map_Device = map[string]string{
122122
"nodeSelector": "NodeSelector defines the nodes where the device is available.\n\nMust use exactly one term.\n\nMust only be set if Spec.PerDeviceNodeSelection is set to true. At most one of NodeName, NodeSelector and AllNodes can be set.",
123123
"allNodes": "AllNodes indicates that all nodes have access to the device.\n\nMust only be set if Spec.PerDeviceNodeSelection is set to true. At most one of NodeName, NodeSelector and AllNodes can be set.",
124124
"taints": "If specified, these are the driver-defined taints.\n\nThe maximum number of taints is 16. If taints are set for any device in a ResourceSlice, then the maximum number of allowed devices per ResourceSlice is 64 instead of 128.\n\nThis is a beta field and requires enabling the DRADeviceTaints feature gate.",
125-
"bindsToNode": "BindsToNode indicates if the usage of an allocation involving this device has to be limited to exactly the node that was chosen when allocating the claim. If set to true, the scheduler will set the ResourceClaim.Status.Allocation.NodeSelector to match the node where the allocation was made.\n\nThis is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
126-
"bindingConditions": "BindingConditions defines the conditions for proceeding with binding. All of these conditions must be set in the per-device status conditions with a value of True to proceed with binding the pod to the node while scheduling the pod.\n\nThe maximum number of binding conditions is 4.\n\nThe conditions must be a valid condition type string.\n\nThis is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
127-
"bindingFailureConditions": "BindingFailureConditions defines the conditions for binding failure. They may be set in the per-device status conditions. If any is set to \"True\", a binding failure occurred.\n\nThe maximum number of binding failure conditions is 4.\n\nThe conditions must be a valid condition type string.\n\nThis is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
125+
"bindsToNode": "BindsToNode indicates if the usage of an allocation involving this device has to be limited to exactly the node that was chosen when allocating the claim. If set to true, the scheduler will set the ResourceClaim.Status.Allocation.NodeSelector to match the node where the allocation was made.\n\nThis is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
126+
"bindingConditions": "BindingConditions defines the conditions for proceeding with binding. All of these conditions must be set in the per-device status conditions with a value of True to proceed with binding the pod to the node while scheduling the pod.\n\nThe maximum number of binding conditions is 4.\n\nThe conditions must be a valid condition type string.\n\nThis is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
127+
"bindingFailureConditions": "BindingFailureConditions defines the conditions for binding failure. They may be set in the per-device status conditions. If any is set to \"True\", a binding failure occurred.\n\nThe maximum number of binding failure conditions is 4.\n\nThe conditions must be a valid condition type string.\n\nThis is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
128128
"allowMultipleAllocations": "AllowMultipleAllocations marks whether the device is allowed to be allocated to multiple DeviceRequests.\n\nIf AllowMultipleAllocations is set to true, the device can be allocated more than once, and all of its capacity is consumable, regardless of whether the requestPolicy is defined or not.",
129129
}
130130

@@ -282,8 +282,8 @@ var map_DeviceRequestAllocationResult = map[string]string{
282282
"device": "Device references one device instance via its name in the driver's resource pool. It must be a DNS label.",
283283
"adminAccess": "AdminAccess indicates that this device was allocated for administrative access. See the corresponding request field for a definition of mode.\n\nAdmin access is disabled if this field is unset or set to false, otherwise it is enabled.",
284284
"tolerations": "A copy of all tolerations specified in the request at the time when the device got allocated.\n\nThe maximum number of tolerations is 16.\n\nThis is a beta field and requires enabling the DRADeviceTaints feature gate.",
285-
"bindingConditions": "BindingConditions contains a copy of the BindingConditions from the corresponding ResourceSlice at the time of allocation.\n\nThis is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
286-
"bindingFailureConditions": "BindingFailureConditions contains a copy of the BindingFailureConditions from the corresponding ResourceSlice at the time of allocation.\n\nThis is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
285+
"bindingConditions": "BindingConditions contains a copy of the BindingConditions from the corresponding ResourceSlice at the time of allocation.\n\nThis is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
286+
"bindingFailureConditions": "BindingFailureConditions contains a copy of the BindingFailureConditions from the corresponding ResourceSlice at the time of allocation.\n\nThis is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus feature gates.",
287287
"shareID": "ShareID uniquely identifies an individual allocation share of the device, used when the device supports multiple simultaneous allocations. It serves as an additional map key to differentiate concurrent shares of the same device.",
288288
"consumedCapacity": "ConsumedCapacity tracks the amount of capacity consumed per device as part of the claim request. The consumed amount may differ from the requested amount: it is rounded up to the nearest valid value based on the device’s requestPolicy if applicable (i.e., may not be less than the requested amount).\n\nThe total consumed capacity for each device must not exceed the DeviceCapacity's Value.\n\nThis field is populated only for devices that allow multiple allocations. All capacity entries are included, even if the consumed amount is zero.",
289289
}

resource/v1beta1/generated.proto

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

resource/v1beta1/types.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ type BasicDevice struct {
400400
// If set to true, the scheduler will set the ResourceClaim.Status.Allocation.NodeSelector
401401
// to match the node where the allocation was made.
402402
//
403-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
403+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
404404
// feature gates.
405405
//
406406
// +optional
@@ -416,7 +416,7 @@ type BasicDevice struct {
416416
//
417417
// The conditions must be a valid condition type string.
418418
//
419-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
419+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
420420
// feature gates.
421421
//
422422
// +optional
@@ -434,7 +434,7 @@ type BasicDevice struct {
434434
//
435435
// The conditions must be a valid condition type string.
436436
//
437-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
437+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
438438
// feature gates.
439439
//
440440
// +optional
@@ -1578,7 +1578,7 @@ type AllocationResult struct {
15781578
// AllocationTimestamp stores the time when the resources were allocated.
15791579
// This field is not guaranteed to be set, in which case that time is unknown.
15801580
//
1581-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
1581+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
15821582
// feature gate.
15831583
//
15841584
// +optional
@@ -1688,7 +1688,7 @@ type DeviceRequestAllocationResult struct {
16881688
// BindingConditions contains a copy of the BindingConditions
16891689
// from the corresponding ResourceSlice at the time of allocation.
16901690
//
1691-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
1691+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
16921692
// feature gates.
16931693
//
16941694
// +optional
@@ -1701,7 +1701,7 @@ type DeviceRequestAllocationResult struct {
17011701
// BindingFailureConditions contains a copy of the BindingFailureConditions
17021702
// from the corresponding ResourceSlice at the time of allocation.
17031703
//
1704-
// This is an alpha field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
1704+
// This is a beta field and requires enabling the DRADeviceBindingConditions and DRAResourceClaimDeviceStatus
17051705
// feature gates.
17061706
//
17071707
// +optional

0 commit comments

Comments
 (0)