From fc2134c84cc1c84a1cc1278401f70fce93eb11c3 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Mon, 11 Mar 2024 13:51:29 +0000 Subject: [PATCH] dra kubelet: fix error log Previously we were returning the error string from 'err' (which is nil), when we should have been returning it from result.Error. Without this it is hard to debug issues with NodeUnprepareResources. Signed-off-by: Kevin Klues --- pkg/kubelet/cm/dra/manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/cm/dra/manager.go b/pkg/kubelet/cm/dra/manager.go index 8a6ee2dd320..100deaae637 100644 --- a/pkg/kubelet/cm/dra/manager.go +++ b/pkg/kubelet/cm/dra/manager.go @@ -380,7 +380,7 @@ func (m *ManagerImpl) UnprepareResources(pod *v1.Pod) error { return fmt.Errorf("NodeUnprepareResources returned result for unknown claim UID %s", claimUID) } if result.Error != "" { - return fmt.Errorf("NodeUnprepareResources failed for claim %s/%s: %s", reqClaim.Namespace, reqClaim.Name, err) + return fmt.Errorf("NodeUnprepareResources failed for claim %s/%s: %s", reqClaim.Namespace, reqClaim.Name, result.Error) } // Delete last pod UID only if unprepare succeeds.