kubectl scale: proceed even if there is invalid resource in multi

Kubernetes-commit: b84f192acc61b5fa9dc438950e6cc57f75889853
This commit is contained in:
Arda Güçlü 2022-12-02 17:23:44 +03:00 committed by Kubernetes Publisher
parent 68a87e8d32
commit ee99503f34
1 changed files with 6 additions and 5 deletions

View File

@ -211,10 +211,11 @@ func (o *ScaleOptions) RunScale() error {
return err return err
} }
infos, err := r.Infos() // We don't immediately return infoErr if it is not nil.
if err != nil { // Because we want to proceed for other valid resources and
return err // at the end of the function, we'll return this
} // to show invalid resources to the user.
infos, infoErr := r.Infos()
if len(o.ResourceVersion) != 0 && len(infos) > 1 { if len(o.ResourceVersion) != 0 && len(infos) > 1 {
return fmt.Errorf("cannot use --resource-version with multiple resources") return fmt.Errorf("cannot use --resource-version with multiple resources")
@ -270,7 +271,7 @@ func (o *ScaleOptions) RunScale() error {
} }
} }
return nil return infoErr
} }
func scaler(f cmdutil.Factory) (scale.Scaler, error) { func scaler(f cmdutil.Factory) (scale.Scaler, error) {