mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
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
This commit is contained in:
commit
1ac1865dd7
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user