github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubelet: DRA: remove check to set pluginName to DriverName if not in ResourceHandle

Browse Source 
It has always been validated that a ResourceHandle MUST have DriverName set, so
this check is unnecessary.

Signed-off-by: Kevin Klues <kklues@nvidia.com>
This commit is contained in:
Kevin Klues
2024-05-03 13:10:09 +00:00
parent f80be2728e
commit 805e7c3434
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubelet/cm/dra/manager.go
View File

@@ -223,12 +223,6 @@ func (m *ManagerImpl) PrepareResources(pod *v1.Pod) error {
// Loop through all plugins and prepare for calling NodePrepareResources. // Loop through all plugins and prepare for calling NodePrepareResources.
for _, resourceHandle := range claimInfo.ResourceHandles { 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{ claim := &drapb.Claim{
Namespace: claimInfo.Namespace, Namespace: claimInfo.Namespace,
Uid: string(claimInfo.ClaimUID), Uid: string(claimInfo.ClaimUID),
@@ -238,6 +232,7 @@ func (m *ManagerImpl) PrepareResources(pod *v1.Pod) error {
if resourceHandle.StructuredData != nil { if resourceHandle.StructuredData != nil {
claim.StructuredResourceHandle = []*resourceapi.StructuredResourceHandle{resourceHandle.StructuredData} claim.StructuredResourceHandle = []*resourceapi.StructuredResourceHandle{resourceHandle.StructuredData}
} }
pluginName := resourceHandle.DriverName
batches[pluginName] = append(batches[pluginName], claim) 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. // Loop through all plugins and prepare for calling NodeUnprepareResources.
for _, resourceHandle := range claimInfo.ResourceHandles { 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{ claim := &drapb.Claim{
Namespace: claimInfo.Namespace, Namespace: claimInfo.Namespace,
Uid: string(claimInfo.ClaimUID), Uid: string(claimInfo.ClaimUID),
@@ -475,6 +463,7 @@ func (m *ManagerImpl) unprepareResources(podUID types.UID, namespace string, cla
if resourceHandle.StructuredData != nil { if resourceHandle.StructuredData != nil {
claim.StructuredResourceHandle = []*resourceapi.StructuredResourceHandle{resourceHandle.StructuredData} claim.StructuredResourceHandle = []*resourceapi.StructuredResourceHandle{resourceHandle.StructuredData}
} }
pluginName := resourceHandle.DriverName
batches[pluginName] = append(batches[pluginName], claim) batches[pluginName] = append(batches[pluginName], claim)
} }