Skip to content

Commit 481cc1a

Browse files
authored
Merge pull request kubernetes#129560 from bart0sh/PR168-DRA-fix-All-allocation-mode
DRA: fix allocation mode `All`
2 parents c4434c3 + 829fa63 commit 481cc1a

File tree

13 files changed

+88
-13
lines changed

13 files changed

+88
-13
lines changed

api/openapi-spec/swagger.json

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

api/openapi-spec/v3/apis__resource.k8s.io__v1alpha3_openapi.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/openapi-spec/v3/apis__resource.k8s.io__v1beta1_openapi.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/resource/types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,11 @@ type DeviceRequest struct {
434434
// count field.
435435
//
436436
// - All: This request is for all of the matching devices in a pool.
437+
// At least one device must exist on the node for the allocation to succeed.
437438
// Allocation will fail if some devices are already allocated,
438439
// unless adminAccess is requested.
439440
//
440-
// If AlloctionMode is not specified, the default mode is ExactCount. If
441+
// If AllocationMode is not specified, the default mode is ExactCount. If
441442
// the mode is ExactCount and count is not specified, the default count is
442443
// one. Any other requests must specify this field.
443444
//

pkg/generated/openapi/zz_generated.openapi.go

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

staging/src/k8s.io/api/resource/v1alpha3/generated.proto

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

staging/src/k8s.io/api/resource/v1alpha3/types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,11 @@ type DeviceRequest struct {
432432
// count field.
433433
//
434434
// - All: This request is for all of the matching devices in a pool.
435+
// At least one device must exist on the node for the allocation to succeed.
435436
// Allocation will fail if some devices are already allocated,
436437
// unless adminAccess is requested.
437438
//
438-
// If AlloctionMode is not specified, the default mode is ExactCount. If
439+
// If AllocationMode is not specified, the default mode is ExactCount. If
439440
// the mode is ExactCount and count is not specified, the default count is
440441
// one. Any other requests must specify this field.
441442
//

staging/src/k8s.io/api/resource/v1alpha3/types_swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/resource/v1beta1/generated.proto

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

staging/src/k8s.io/api/resource/v1beta1/types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,10 +440,11 @@ type DeviceRequest struct {
440440
// count field.
441441
//
442442
// - All: This request is for all of the matching devices in a pool.
443+
// At least one device must exist on the node for the allocation to succeed.
443444
// Allocation will fail if some devices are already allocated,
444445
// unless adminAccess is requested.
445446
//
446-
// If AlloctionMode is not specified, the default mode is ExactCount. If
447+
// If AllocationMode is not specified, the default mode is ExactCount. If
447448
// the mode is ExactCount and count is not specified, the default count is
448449
// one. Any other requests must specify this field.
449450
//

0 commit comments

Comments
 (0)