Merge pull request #29484 from kargakis/fix-scaler-error

Automatic merge from submit-queue kubectl: notfound errors should not error out Fixes the flake in https://github.com/kubernetes/kubernetes/issues/28378#issuecomment-234677846 @pwittrock ptal

Merge pull request #29484 from kargakis/fix-scaler-error
1ac1865d · Kubernetes Submit Queue · GitHub · 5429c7a7 · 36522378 · 1ac1865d
Commit 1ac1865d authored Aug 03, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

stop.go pkg/kubectl/stop.go +3 -2

No files found.
--- a/pkg/kubectl/stop.go
+++ b/pkg/kubectl/stop.go
@@ -398,9 +398,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 {