github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2016-08-03 03:13:19 -07:00 committed by GitHub
commit 1ac1865dd7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/stop.go
View File

@ -398,9 +398,10 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati
for _, rc := range rsList.Items { for _, rc := range rsList.Items {
if err := rsReaper.Stop(rc.Namespace, rc.Name, timeout, gracePeriod); err != nil { if err := rsReaper.Stop(rc.Namespace, rc.Name, timeout, gracePeriod); err != nil {
scaleGetErr, ok := err.(*ScaleError) scaleGetErr, ok := err.(*ScaleError)
if !errors.IsNotFound(err) || ok && !errors.IsNotFound(scaleGetErr.ActualError) { if errors.IsNotFound(err) || (ok && errors.IsNotFound(scaleGetErr.ActualError)) {
errList = append(errList, err) continue
} }
errList = append(errList, err)
} }
} }
if len(errList) > 0 { if len(errList) > 0 {