github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

When reaping jobs, ignores its pod not found error

pull/6/head
Janet Kuo 2015-12-17 18:57:22 -08:00
parent 08c2cba266
commit 7a4643f123
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/stop.go
View File

@ -22,6 +22,7 @@ import (
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
@ -259,7 +260,10 @@ func (reaper *JobReaper) Stop(namespace, name string, timeout time.Duration, gra
errList := []error{} errList := []error{}
for _, pod := range podList.Items { for _, pod := range podList.Items {
if err := pods.Delete(pod.Name, gracePeriod); err != nil { 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 { if len(errList) > 0 {