Merge pull request kubernetes#125147 from alexandrevilain/fix/recycler-client

k8s-ci-robot · web-flow · commit 6c34d13e3b52 · 2024-10-04T15:02:27.000+01:00
recyclerclient: fix log message in case of delete pod error
diff --git a/pkg/volume/util/recyclerclient/recycler_client.go b/pkg/volume/util/recyclerclient/recycler_client.go
@@ -90,7 +90,7 @@ func internalRecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *v1.Po
 	klog.V(2).Infof("deleting recycler pod %s/%s", pod.Namespace, pod.Name)
 	deleteErr := recyclerClient.DeletePod(pod.Name, pod.Namespace)
 	if deleteErr != nil {
-		klog.Errorf("failed to delete recycler pod %s/%s: %v", pod.Namespace, pod.Name, err)
+		klog.Errorf("failed to delete recycler pod %s/%s: %v", pod.Namespace, pod.Name, deleteErr)
 	}
 
 	// Returning recycler error is preferred, the pod will be deleted again on

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func internalRecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *v1.Po`
`90`	`90`	`klog.V(2).Infof("deleting recycler pod %s/%s", pod.Namespace, pod.Name)`
`91`	`91`	`deleteErr := recyclerClient.DeletePod(pod.Name, pod.Namespace)`
`92`	`92`	`if deleteErr != nil {`
`93`		`- klog.Errorf("failed to delete recycler pod %s/%s: %v", pod.Namespace, pod.Name, err)`
	`93`	`+ klog.Errorf("failed to delete recycler pod %s/%s: %v", pod.Namespace, pod.Name, deleteErr)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`// Returning recycler error is preferred, the pod will be deleted again on`