github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 20:21:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113021 from rphillips/fixes/112936

Browse Source 
kubelet: fix nil crash in allocateRemainingFrom
This commit is contained in:
Kubernetes Prow Robot
2022-11-01 10:46:45 -07:00
committed by GitHub
parent e6060f2780 2514486d80
commit 1a41cb8985
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/cm/devicemanager/manager.go
View File

@@ -564,16 +564,16 @@ func (m *ManagerImpl) devicesToAllocate(podUID, contName, resource string, requi
return false return false
} }
// Allocates from reusableDevices list first.
if allocateRemainingFrom(reusableDevices) {
return allocated, nil
}
// Needs to allocate additional devices. // Needs to allocate additional devices.
if m.allocatedDevices[resource] == nil { if m.allocatedDevices[resource] == nil {
m.allocatedDevices[resource] = sets.NewString() m.allocatedDevices[resource] = sets.NewString()
} }
// Allocates from reusableDevices list first.
if allocateRemainingFrom(reusableDevices) {
return allocated, nil
}
// Gets Devices in use. // Gets Devices in use.
devicesInUse := m.allocatedDevices[resource] devicesInUse := m.allocatedDevices[resource]
// Gets Available devices. // Gets Available devices.