github/intel-device-plugins-for-kubernetes
7
0
Fork 0
mirror of https://github.com/intel/intel-device-plugins-for-kubernetes.git synced 2025-06-03 03:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #527 from bart0sh/PR0095-language-cleanup

Browse Source 
language cleanup
This commit is contained in:
Mikko Ylinen 2020-12-15 19:57:23 +02:00 committed by GitHub
commit b737fc9520
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/fpga_crihook/testdata/config-correct.json vendored
View File

@ -131,6 +131,6 @@
"gid": 0 "gid": 0
} }
], ],
"rootfsPropagation": "rslave" "rootfsPropagation": "shared"
} }
} }

2
cmd/fpga_crihook/testdata/config-no-FPGA-devices.json vendored
View File

@ -131,6 +131,6 @@
"gid": 0 "gid": 0
} }
], ],
"rootfsPropagation": "rslave" "rootfsPropagation": "shared"
} }
} }

2
cmd/fpga_crihook/testdata/config-no-afu.json vendored
View File

@ -130,6 +130,6 @@
"gid": 0 "gid": 0
} }
], ],
"rootfsPropagation": "rslave" "rootfsPropagation": "shared"
} }
} }

2
cmd/fpga_crihook/testdata/config-no-devices.json vendored
View File

@ -121,6 +121,6 @@
"type": "mount" "type": "mount"
} }
], ],
"rootfsPropagation": "rslave" "rootfsPropagation": "shared"
} }
} }

2
cmd/fpga_crihook/testdata/config-no-env.json vendored
View File

@ -121,6 +121,6 @@
"gid": 0 "gid": 0
} }
], ],
"rootfsPropagation": "rslave" "rootfsPropagation": "shared"
} }
} }

2
cmd/fpga_crihook/testdata/config-no-process.json vendored
View File

@ -110,6 +110,6 @@
"gid": 0 "gid": 0
} }
], ],
"rootfsPropagation": "rslave" "rootfsPropagation": "shared"
} }
} }

2
cmd/fpga_crihook/testdata/config-no-region.json vendored
View File

@ -130,6 +130,6 @@
"gid": 0 "gid": 0
} }
], ],
"rootfsPropagation": "rslave" "rootfsPropagation": "shared"
} }
} }

2
cmd/fpga_crihook/testdata/config-non-existing-bitstream.json vendored
View File

@ -131,6 +131,6 @@
"gid": 0 "gid": 0
} }
], ],
"rootfsPropagation": "rslave" "rootfsPropagation": "shared"
} }
} }

2
cmd/fpga_crihook/testdata/config-region-afu-dont-match.json vendored
View File

@ -132,6 +132,6 @@
"gid": 0 "gid": 0
} }
], ],
"rootfsPropagation": "rslave" "rootfsPropagation": "shared"
} }
} }

7
pkg/topology/topology.go
View File

@ -127,7 +127,8 @@ func getTopologyHint(sysFSPath string) (*Hint, error) {
return &hint, nil return &hint, nil
} }
// NewTopologyHints return array of hints for the device and its slaves (e.g. RAID). // NewTopologyHints return array of hints for the main device and its
// dependend devices (e.g. RAID).
func NewTopologyHints(devPath string) (hints Hints, err error) { func NewTopologyHints(devPath string) (hints Hints, err error) {
hints = make(Hints) hints = make(Hints)
realDevPath, err := filepath.EvalSymlinks(devPath) realDevPath, err := filepath.EvalSymlinks(devPath)
@ -145,8 +146,8 @@ func NewTopologyHints(devPath string) (hints Hints, err error) {
} }
} }
fromVirtual, _ := getDevicesFromVirtual(realDevPath) fromVirtual, _ := getDevicesFromVirtual(realDevPath)
slaves, _ := filepath.Glob(filepath.Join(realDevPath, "slaves/*")) deps, _ := filepath.Glob(filepath.Join(realDevPath, "slaves/*"))
for _, device := range append(slaves, fromVirtual...) { for _, device := range append(deps, fromVirtual...) {
deviceHints, er := NewTopologyHints(device) deviceHints, er := NewTopologyHints(device)
if er != nil { if er != nil {
return nil, er return nil, er