From 36522378f45607c5ec186948a8534520075e9f94 Mon Sep 17 00:00:00 2001 From: Michail Kargakis Date: Sat, 23 Jul 2016 02:03:15 +0200 Subject: [PATCH] kubectl: notfound errors should not error out --- pkg/kubectl/stop.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index 782d66bb04c..09aa2f68dd1 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -397,9 +397,10 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati for _, rc := range rsList.Items { if err := rsReaper.Stop(rc.Namespace, rc.Name, timeout, gracePeriod); err != nil { scaleGetErr, ok := err.(*ScaleError) - if !errors.IsNotFound(err) || ok && !errors.IsNotFound(scaleGetErr.ActualError) { - errList = append(errList, err) + if errors.IsNotFound(err) || (ok && errors.IsNotFound(scaleGetErr.ActualError)) { + continue } + errList = append(errList, err) } } if len(errList) > 0 {