From 413763f23542cddb0b7ef5ca995778a396eaabfd Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Tue, 23 Feb 2021 09:11:14 -0600 Subject: [PATCH] Merge pull request #10064 from superfly/add-allocated-devices-to-api Add devices to AllocatedTaskResources --- api/allocations.go | 8 ++++++++ go.sum | 1 - vendor/github.com/hashicorp/nomad/api/allocations.go | 8 ++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/api/allocations.go b/api/allocations.go index 50f8cce938cf..8933e048a406 100644 --- a/api/allocations.go +++ b/api/allocations.go @@ -468,6 +468,7 @@ type AllocatedTaskResources struct { Cpu AllocatedCpuResources Memory AllocatedMemoryResources Networks []*NetworkResource + Devices []*AllocatedDeviceResource } type AllocatedSharedResources struct { @@ -491,6 +492,13 @@ type AllocatedMemoryResources struct { MemoryMB int64 } +type AllocatedDeviceResource struct { + Vendor string + Type string + Name string + DeviceIDs []string +} + // AllocIndexSort reverse sorts allocs by CreateIndex. type AllocIndexSort []*AllocationListStub diff --git a/go.sum b/go.sum index 240ef9780ff9..ad38dd2daf8c 100644 --- a/go.sum +++ b/go.sum @@ -433,7 +433,6 @@ github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea h1:xykPFhrBA github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.8.3/go.mod h1:UpNcs7fFbpKIyZaUuSW6EPiH+eZC7OuyFD+wc1oal+k= -github.com/hashicorp/serf v0.9.3 h1:AVF6JDQQens6nMHT9OGERBvK0f8rPrAGILnsKLr6lzM= github.com/hashicorp/serf v0.9.3/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.5 h1:EBWvyu9tcRszt3Bxp3KNssBMP1KuHWyO51lz9+786iM= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= diff --git a/vendor/github.com/hashicorp/nomad/api/allocations.go b/vendor/github.com/hashicorp/nomad/api/allocations.go index 50f8cce938cf..8933e048a406 100644 --- a/vendor/github.com/hashicorp/nomad/api/allocations.go +++ b/vendor/github.com/hashicorp/nomad/api/allocations.go @@ -468,6 +468,7 @@ type AllocatedTaskResources struct { Cpu AllocatedCpuResources Memory AllocatedMemoryResources Networks []*NetworkResource + Devices []*AllocatedDeviceResource } type AllocatedSharedResources struct { @@ -491,6 +492,13 @@ type AllocatedMemoryResources struct { MemoryMB int64 } +type AllocatedDeviceResource struct { + Vendor string + Type string + Name string + DeviceIDs []string +} + // AllocIndexSort reverse sorts allocs by CreateIndex. type AllocIndexSort []*AllocationListStub