Skip to content

Commit 988fbed

Browse files
bart0shbart0sh
committed
deviceplugin: add DeviceInfo.hooks field
1 parent 7daa87a commit 988fbed

File tree

11 files changed

+41
-30
lines changed

11 files changed

+41
-30
lines changed

‎cmd/dlb_plugin/dlb_plugin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (dp *DevicePlugin) scan() dpapi.DeviceTree {
8888
ContainerPath: file,
8989
Permissions: "rw",
9090
}}
91-
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, nil, nil)
91+
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, nil, nil, nil)
9292

9393
sysfsDev := filepath.Join(dp.sysfsDir, filepath.Base(file))
9494
sriovNumVFs := pluginutils.GetSriovNumVFs(sysfsDev)

‎cmd/fpga_plugin/dfl_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func TestGetRegionDevelTreeDFL(t *testing.T) {
139139
Permissions: "rw",
140140
},
141141
}
142-
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
142+
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
143143

144144
nodes = []pluginapi.DeviceSpec{
145145
{
@@ -158,7 +158,7 @@ func TestGetRegionDevelTreeDFL(t *testing.T) {
158158
Permissions: "rw",
159159
},
160160
}
161-
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
161+
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
162162

163163
nodes = []pluginapi.DeviceSpec{
164164
{
@@ -177,7 +177,7 @@ func TestGetRegionDevelTreeDFL(t *testing.T) {
177177
Permissions: "rw",
178178
},
179179
}
180-
expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
180+
expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil, nil))
181181

182182
result := getRegionDevelTree(getDevicesDFL())
183183
if !reflect.DeepEqual(result, expected) {
@@ -194,7 +194,7 @@ func TestGetRegionTreeDFL(t *testing.T) {
194194
Permissions: "rw",
195195
},
196196
}
197-
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
197+
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
198198

199199
nodes = []pluginapi.DeviceSpec{
200200
{
@@ -208,7 +208,7 @@ func TestGetRegionTreeDFL(t *testing.T) {
208208
Permissions: "rw",
209209
},
210210
}
211-
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
211+
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
212212

213213
nodes = []pluginapi.DeviceSpec{
214214
{
@@ -222,7 +222,7 @@ func TestGetRegionTreeDFL(t *testing.T) {
222222
Permissions: "rw",
223223
},
224224
}
225-
expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
225+
expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil, nil))
226226

227227
result := getRegionTree(getDevicesDFL())
228228
if !reflect.DeepEqual(result, expected) {
@@ -239,7 +239,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
239239
Permissions: "rw",
240240
},
241241
}
242-
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
242+
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
243243

244244
nodes = []pluginapi.DeviceSpec{
245245
{
@@ -249,7 +249,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
249249
},
250250
}
251251

252-
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
252+
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
253253

254254
nodes = []pluginapi.DeviceSpec{
255255
{
@@ -258,7 +258,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
258258
Permissions: "rw",
259259
},
260260
}
261-
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
261+
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
262262

263263
nodes = []pluginapi.DeviceSpec{
264264
{
@@ -267,7 +267,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
267267
Permissions: "rw",
268268
},
269269
}
270-
expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
270+
expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil, nil))
271271

272272
nodes = []pluginapi.DeviceSpec{
273273
{
@@ -276,7 +276,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
276276
Permissions: "rw",
277277
},
278278
}
279-
expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.4", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
279+
expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.4", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil, nil))
280280

281281
result := getAfuTree(getDevicesDFL())
282282
if !reflect.DeepEqual(result, expected) {

‎cmd/fpga_plugin/fpga_plugin.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func getRegionDevelTree(devices []device) dpapi.DeviceTree {
8383
Permissions: "rw",
8484
}
8585

86-
regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil))
86+
regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil, nil))
8787
}
8888
}
8989

@@ -112,7 +112,7 @@ func getRegionTree(devices []device) dpapi.DeviceTree {
112112
}
113113
}
114114

115-
regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil))
115+
regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil, nil))
116116
}
117117
}
118118

@@ -144,7 +144,7 @@ func getAfuTree(devices []device) dpapi.DeviceTree {
144144
Permissions: "rw",
145145
},
146146
}
147-
afuTree.AddDevice(devType, afu.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil))
147+
afuTree.AddDevice(devType, afu.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil, nil))
148148
}
149149
}
150150
}

‎cmd/fpga_plugin/opae_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func TestGetRegionDevelTreeOPAE(t *testing.T) {
129129
Permissions: "rw",
130130
},
131131
}
132-
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
132+
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
133133

134134
nodes = []pluginapi.DeviceSpec{
135135
{
@@ -143,7 +143,7 @@ func TestGetRegionDevelTreeOPAE(t *testing.T) {
143143
Permissions: "rw",
144144
},
145145
}
146-
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
146+
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
147147

148148
nodes = []pluginapi.DeviceSpec{
149149
{
@@ -157,7 +157,7 @@ func TestGetRegionDevelTreeOPAE(t *testing.T) {
157157
Permissions: "rw",
158158
},
159159
}
160-
expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
160+
expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil, nil))
161161

162162
result := getRegionDevelTree(getDevicesOPAE())
163163
if !reflect.DeepEqual(result, expected) {
@@ -174,7 +174,7 @@ func TestGetRegionTreeOPAE(t *testing.T) {
174174
Permissions: "rw",
175175
},
176176
}
177-
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
177+
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
178178

179179
nodes = []pluginapi.DeviceSpec{
180180
{
@@ -183,7 +183,7 @@ func TestGetRegionTreeOPAE(t *testing.T) {
183183
Permissions: "rw",
184184
},
185185
}
186-
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
186+
expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
187187

188188
nodes = []pluginapi.DeviceSpec{
189189
{
@@ -192,7 +192,7 @@ func TestGetRegionTreeOPAE(t *testing.T) {
192192
Permissions: "rw",
193193
},
194194
}
195-
expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
195+
expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil, nil))
196196

197197
result := getRegionTree(getDevicesOPAE())
198198
if !reflect.DeepEqual(result, expected) {
@@ -209,7 +209,7 @@ func TestGetAfuTreeOPAE(t *testing.T) {
209209
Permissions: "rw",
210210
},
211211
}
212-
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
212+
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
213213

214214
nodes = []pluginapi.DeviceSpec{
215215
{
@@ -218,7 +218,7 @@ func TestGetAfuTreeOPAE(t *testing.T) {
218218
Permissions: "rw",
219219
},
220220
}
221-
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
221+
expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil, nil))
222222

223223
nodes = []pluginapi.DeviceSpec{
224224
{
@@ -227,7 +227,7 @@ func TestGetAfuTreeOPAE(t *testing.T) {
227227
Permissions: "rw",
228228
},
229229
}
230-
expected.AddDevice("af-fff.fff.__________________________________________8", "intel-fpga-port.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
230+
expected.AddDevice("af-fff.fff.__________________________________________8", "intel-fpga-port.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil, nil))
231231

232232
result := getAfuTree(getDevicesOPAE())
233233
if !reflect.DeepEqual(result, expected) {

‎cmd/gpu_plugin/gpu_plugin.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
514514
mounts = dp.bypathMountsForPci(cardPath, name, dp.bypathDir)
515515
}
516516

517-
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devSpecs, mounts, nil, nil)
517+
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devSpecs, mounts, nil, nil, nil)
518518

519519
for i := 0; i < dp.options.sharedDevNum; i++ {
520520
devID := fmt.Sprintf("%s-%d", name, i)
@@ -534,7 +534,7 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
534534
// all Intel GPUs are under single monitoring resource per KMD
535535
if len(monitor) > 0 {
536536
for resourceName, devices := range monitor {
537-
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devices, nil, nil, nil)
537+
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devices, nil, nil, nil, nil)
538538
devTree.AddDevice(resourceName, monitorID, deviceInfo)
539539
}
540540
}

‎cmd/qat_plugin/dpdkdrv/dpdkdrv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ func (dp *DevicePlugin) scan() (dpapi.DeviceTree, error) {
662662
fmt.Sprintf("%s%d", envVarPrefix, n): vfBdf,
663663
}
664664

665-
devinfo := dpapi.NewDeviceInfo(healthiness, dp.getDpdkDeviceSpecs(dpdkDeviceName), dp.getDpdkMounts(dpdkDeviceName), envs, nil)
665+
devinfo := dpapi.NewDeviceInfo(healthiness, dp.getDpdkDeviceSpecs(dpdkDeviceName), dp.getDpdkMounts(dpdkDeviceName), envs, nil, nil)
666666

667667
devTree.AddDevice(cap, vfBdf, devinfo)
668668
}

‎cmd/qat_plugin/kerneldrv/kerneldrv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func getDevTree(sysfs string, qatDevs []device, config map[string]section) (dpap
102102
// The rest should use QAT_SECTION_NAME_XXX variables.
103103
"QAT_SECTION_NAME": sname,
104104
}
105-
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, envs, nil)
105+
deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, envs, nil, nil)
106106
devTree.AddDevice(devType, fmt.Sprintf("%s_%s_%d", sname, ep.id, i), deviceInfo)
107107

108108
uniqID++

‎go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ require (
7474
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7575
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7676
github.com/opencontainers/go-digest v1.0.0 // indirect
77+
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
7778
github.com/prometheus/client_golang v1.18.0 // indirect
7879
github.com/prometheus/procfs v0.12.0 // indirect
7980
github.com/spf13/cobra v1.7.0 // indirect
@@ -122,6 +123,7 @@ require (
122123
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
123124
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
124125
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
126+
tags.cncf.io/container-device-interface/specs-go v0.7.0 // indirect
125127
)
126128

127129
replace (

‎go.sum

+4
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
148148
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
149149
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
150150
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
151+
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R5M2qXZiK/mWPMT4VldCOiSL9HIAMuxQZWdG0CSM5+4=
152+
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
151153
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
152154
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
153155
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -367,3 +369,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+s
367369
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
368370
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
369371
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
372+
tags.cncf.io/container-device-interface/specs-go v0.7.0 h1:w/maMGVeLP6TIQJVYT5pbqTi8SCw/iHZ+n4ignuGHqg=
373+
tags.cncf.io/container-device-interface/specs-go v0.7.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=

‎pkg/deviceplugin/api.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"github.com/intel/intel-device-plugins-for-kubernetes/pkg/topology"
2020
"k8s.io/klog/v2"
2121
pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
22+
cdispec "tags.cncf.io/container-device-interface/specs-go"
2223
)
2324

2425
// DeviceInfo contains information about device maintained by Device Plugin.
@@ -29,6 +30,9 @@ type DeviceInfo struct {
2930
topology *pluginapi.TopologyInfo
3031
state string
3132
nodes []pluginapi.DeviceSpec
33+
// Hooks can be passed only through CDI
34+
// https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/4009-add-cdi-devices-to-device-plugin-api
35+
hooks []*cdispec.Hook
3236
}
3337

3438
// UseDefaultMethodError allows the plugin to request running the default
@@ -45,13 +49,14 @@ func init() {
4549
}
4650

4751
// NewDeviceInfo makes DeviceInfo struct and adds topology information to it.
48-
func NewDeviceInfo(state string, nodes []pluginapi.DeviceSpec, mounts []pluginapi.Mount, envs map[string]string, annotations map[string]string) DeviceInfo {
52+
func NewDeviceInfo(state string, nodes []pluginapi.DeviceSpec, mounts []pluginapi.Mount, envs, annotations map[string]string, hooks []*cdispec.Hook) DeviceInfo {
4953
deviceInfo := DeviceInfo{
5054
state: state,
5155
nodes: nodes,
5256
mounts: mounts,
5357
envs: envs,
5458
annotations: annotations,
59+
hooks: hooks,
5560
}
5661

5762
devPaths := []string{}

‎pkg/idxd/plugin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func (dp *DevicePlugin) scan() (dpapi.DeviceTree, error) {
200200
for i := 0; i < amount; i++ {
201201
deviceType := fmt.Sprintf("wq-%s-%s", wqType, wqMode)
202202
deviceID := fmt.Sprintf("%s-%s-%d", deviceType, wqName, i)
203-
devTree.AddDevice(deviceType, deviceID, dpapi.NewDeviceInfo(pluginapi.Healthy, devNodes, nil, nil, nil))
203+
devTree.AddDevice(deviceType, deviceID, dpapi.NewDeviceInfo(pluginapi.Healthy, devNodes, nil, nil, nil, nil))
204204
}
205205
}
206206

0 commit comments

Comments
 (0)