From 805e7c3434ac568c06abbc34a0affaba78c94278 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Fri, 3 May 2024 13:10:09 +0000 Subject: [PATCH] kubelet: DRA: remove check to set pluginName to DriverName if not in ResourceHandle It has always been validated that a ResourceHandle MUST have DriverName set, so this check is unnecessary. Signed-off-by: Kevin Klues --- pkg/kubelet/cm/dra/manager.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkg/kubelet/cm/dra/manager.go b/pkg/kubelet/cm/dra/manager.go index 07ad55d71a2..18806006031 100644 --- a/pkg/kubelet/cm/dra/manager.go +++ b/pkg/kubelet/cm/dra/manager.go @@ -223,12 +223,6 @@ func (m *ManagerImpl) PrepareResources(pod *v1.Pod) error { // Loop through all plugins and prepare for calling NodePrepareResources. for _, resourceHandle := range claimInfo.ResourceHandles { - // If no DriverName is provided in the resourceHandle, we - // use the DriverName from the status - pluginName := claimInfo.DriverName - if pluginName == "" { - pluginName = claimInfo.DriverName - } claim := &drapb.Claim{ Namespace: claimInfo.Namespace, Uid: string(claimInfo.ClaimUID), @@ -238,6 +232,7 @@ func (m *ManagerImpl) PrepareResources(pod *v1.Pod) error { if resourceHandle.StructuredData != nil { claim.StructuredResourceHandle = []*resourceapi.StructuredResourceHandle{resourceHandle.StructuredData} } + pluginName := resourceHandle.DriverName batches[pluginName] = append(batches[pluginName], claim) } @@ -459,13 +454,6 @@ func (m *ManagerImpl) unprepareResources(podUID types.UID, namespace string, cla // Loop through all plugins and prepare for calling NodeUnprepareResources. for _, resourceHandle := range claimInfo.ResourceHandles { - // If no DriverName is provided in the resourceHandle, we - // use the DriverName from the status - pluginName := resourceHandle.DriverName - if pluginName == "" { - pluginName = claimInfo.DriverName - } - claim := &drapb.Claim{ Namespace: claimInfo.Namespace, Uid: string(claimInfo.ClaimUID), @@ -475,6 +463,7 @@ func (m *ManagerImpl) unprepareResources(podUID types.UID, namespace string, cla if resourceHandle.StructuredData != nil { claim.StructuredResourceHandle = []*resourceapi.StructuredResourceHandle{resourceHandle.StructuredData} } + pluginName := resourceHandle.DriverName batches[pluginName] = append(batches[pluginName], claim) }