mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Merge pull request #113021 from rphillips/fixes/112936
kubelet: fix nil crash in allocateRemainingFrom
This commit is contained in:
		@@ -564,16 +564,16 @@ func (m *ManagerImpl) devicesToAllocate(podUID, contName, resource string, requi
 | 
			
		||||
		return false
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Allocates from reusableDevices list first.
 | 
			
		||||
	if allocateRemainingFrom(reusableDevices) {
 | 
			
		||||
		return allocated, nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Needs to allocate additional devices.
 | 
			
		||||
	if m.allocatedDevices[resource] == nil {
 | 
			
		||||
		m.allocatedDevices[resource] = sets.NewString()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Allocates from reusableDevices list first.
 | 
			
		||||
	if allocateRemainingFrom(reusableDevices) {
 | 
			
		||||
		return allocated, nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Gets Devices in use.
 | 
			
		||||
	devicesInUse := m.allocatedDevices[resource]
 | 
			
		||||
	// Gets Available devices.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user