Skip to content

K
k3s
Commit 1ac1865d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 5429c7a7 36522378
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
pkg/kubectl/stop.go
View file @ 1ac1865d
...@@ -398,9 +398,10 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment