Commit 439d7a72 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #18878 from janetkuo/delete-job-pod

Auto commit by PR queue bot
parents de338e88 7a4643f1
......@@ -22,6 +22,7 @@ import (
"time"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apis/extensions"
......@@ -259,7 +260,10 @@ func (reaper *JobReaper) Stop(namespace, name string, timeout time.Duration, gra
errList := []error{}
for _, pod := range podList.Items {
if err := pods.Delete(pod.Name, gracePeriod); err != nil {
errList = append(errList, err)
// ignores the error when the pod isn't found
if !errors.IsNotFound(err) {
errList = append(errList, err)
}
}
}
if len(errList) > 0 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment