Skip to content

Commit 3340bee

Browse files
authored
Merge pull request kubernetes#94258 from deads2k/fix-drain-msg
update drain message to include namespace for pod
2 parents 08d20fb + 9655953 commit 3340bee

File tree

1 file changed

+3
-3
lines changed
  • staging/src/k8s.io/kubectl/pkg/drain

1 file changed

+3
-3
lines changed

staging/src/k8s.io/kubectl/pkg/drain/drain.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ func (d *Helper) evictPods(pods []corev1.Pod, policyGroupVersion string, getPodF
264264
select {
265265
case <-ctx.Done():
266266
// return here or we'll leak a goroutine.
267-
returnCh <- fmt.Errorf("error when evicting pod %q: global timeout reached: %v", pod.Name, globalTimeout)
267+
returnCh <- fmt.Errorf("error when evicting pods/%q -n %q: global timeout reached: %v", pod.Name, pod.Namespace, globalTimeout)
268268
return
269269
default:
270270
}
@@ -275,10 +275,10 @@ func (d *Helper) evictPods(pods []corev1.Pod, policyGroupVersion string, getPodF
275275
returnCh <- nil
276276
return
277277
} else if apierrors.IsTooManyRequests(err) {
278-
fmt.Fprintf(d.ErrOut, "error when evicting pod %q (will retry after 5s): %v\n", pod.Name, err)
278+
fmt.Fprintf(d.ErrOut, "error when evicting pods/%q -n %q (will retry after 5s): %v\n", pod.Name, pod.Namespace, err)
279279
time.Sleep(5 * time.Second)
280280
} else {
281-
returnCh <- fmt.Errorf("error when evicting pod %q: %v", pod.Name, err)
281+
returnCh <- fmt.Errorf("error when evicting pods/%q -n %q: %v", pod.Name, pod.Namespace, err)
282282
return
283283
}
284284
}

0 commit comments

Comments
 (0)