mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Merge pull request #82477 from haoshuwei/add-missing-err-return
fix some missing errors return statements
This commit is contained in:
commit
5b496d2a25
@ -225,12 +225,10 @@ vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper
|
||||
vendor/k8s.io/kube-aggregator/pkg/controllers/autoregister
|
||||
vendor/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator
|
||||
vendor/k8s.io/kubectl/pkg/cmd/annotate
|
||||
vendor/k8s.io/kubectl/pkg/cmd/apply
|
||||
vendor/k8s.io/kubectl/pkg/cmd/certificates
|
||||
vendor/k8s.io/kubectl/pkg/cmd/config
|
||||
vendor/k8s.io/kubectl/pkg/cmd/edit
|
||||
vendor/k8s.io/kubectl/pkg/cmd/exec
|
||||
vendor/k8s.io/kubectl/pkg/cmd/label
|
||||
vendor/k8s.io/kubectl/pkg/cmd/proxy
|
||||
vendor/k8s.io/kubectl/pkg/cmd/rollingupdate
|
||||
vendor/k8s.io/kubectl/pkg/cmd/scale
|
||||
|
@ -90,6 +90,9 @@ func (s *DryRunnableStorage) GuaranteedUpdate(
|
||||
return err
|
||||
}
|
||||
rev, err := s.Versioner().ObjectResourceVersion(ptrToType)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
out, _, err := tryUpdate(ptrToType, storage.ResponseMeta{ResourceVersion: rev})
|
||||
if err != nil {
|
||||
return err
|
||||
|
@ -250,6 +250,9 @@ func (o *ApplyOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
|
||||
|
||||
o.OpenAPISchema, _ = f.OpenAPISchema()
|
||||
o.Validator, err = f.Validator(cmdutil.GetFlagBool(cmd, "validate"))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
o.Builder = f.NewBuilder()
|
||||
o.Mapper, err = f.ToRESTMapper()
|
||||
if err != nil {
|
||||
|
@ -181,6 +181,9 @@ func (o *LabelOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
|
||||
}
|
||||
o.resources = resources
|
||||
o.newLabels, o.removeLabels, err = parseLabels(labelArgs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if o.list && len(o.outputFormat) > 0 {
|
||||
return fmt.Errorf("--list and --output may not be specified together")
|
||||
|
Loading…
Reference in New Issue
Block a user