Merge pull request #10064 from superfly/add-allocated-devices-to-api

Add devices to AllocatedTaskResources
This commit is contained in:
Seth Hoenig
2021-02-23 09:11:14 -06:00
committed by GitHub
3 changed files with 16 additions and 1 deletions

View File

@@ -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

1
go.sum
View File

@@ -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=

View File

@@ -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