From 26cb6506555e5d10218affda0f22efd9b18a42ae Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Sat, 4 Jul 2020 12:35:04 +0000 Subject: [PATCH] Remove unnecessary union after call to GetPreferredAllocation() There is no need to try and allocate already-allocated devices again. --- pkg/kubelet/cm/devicemanager/manager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/cm/devicemanager/manager.go b/pkg/kubelet/cm/devicemanager/manager.go index b2f16b0c0e9..5d1925f9458 100644 --- a/pkg/kubelet/cm/devicemanager/manager.go +++ b/pkg/kubelet/cm/devicemanager/manager.go @@ -709,7 +709,7 @@ func (m *ManagerImpl) devicesToAllocate(podUID, contName, resource string, requi if err != nil { return nil, err } - if allocateRemainingFrom(preferred.Intersection(aligned.Union(allocated))) { + if allocateRemainingFrom(preferred.Intersection(aligned)) { return allocated, nil } // Then fallback to allocate from the aligned set if no preferred list @@ -734,7 +734,7 @@ func (m *ManagerImpl) devicesToAllocate(podUID, contName, resource string, requi if err != nil { return nil, err } - if allocateRemainingFrom(preferred.Intersection(available.Union(allocated))) { + if allocateRemainingFrom(preferred.Intersection(available)) { return allocated, nil }