From 7a4643f123c6aa1490d90099616a972cba1621a4 Mon Sep 17 00:00:00 2001
From: Janet Kuo <chiachenk@google.com>
Date: Thu, 17 Dec 2015 18:57:22 -0800
Subject: [PATCH] When reaping jobs, ignores its pod not found error

---
 pkg/kubectl/stop.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go
index 992d6487629..11409dfc11a 100644
--- a/pkg/kubectl/stop.go
+++ b/pkg/kubectl/stop.go
@@ -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 {