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

Merge pull request #82477 from haoshuwei/add-missing-err-return

Browse Source 
fix some missing errors return statements
This commit is contained in:
Kubernetes Prow Robot 2019-09-11 18:29:57 -07:00 committed by GitHub
commit 5b496d2a25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.staticcheck_failures
View File

@ -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/autoregister
vendor/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator vendor/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator
vendor/k8s.io/kubectl/pkg/cmd/annotate 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/certificates
vendor/k8s.io/kubectl/pkg/cmd/config vendor/k8s.io/kubectl/pkg/cmd/config
vendor/k8s.io/kubectl/pkg/cmd/edit vendor/k8s.io/kubectl/pkg/cmd/edit
vendor/k8s.io/kubectl/pkg/cmd/exec 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/proxy
vendor/k8s.io/kubectl/pkg/cmd/rollingupdate vendor/k8s.io/kubectl/pkg/cmd/rollingupdate
vendor/k8s.io/kubectl/pkg/cmd/scale vendor/k8s.io/kubectl/pkg/cmd/scale

3
staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go
View File

@ -90,6 +90,9 @@ func (s *DryRunnableStorage) GuaranteedUpdate(
return err return err
} }
rev, err := s.Versioner().ObjectResourceVersion(ptrToType) rev, err := s.Versioner().ObjectResourceVersion(ptrToType)
if err != nil {
return err
}
out, _, err := tryUpdate(ptrToType, storage.ResponseMeta{ResourceVersion: rev}) out, _, err := tryUpdate(ptrToType, storage.ResponseMeta{ResourceVersion: rev})
if err != nil { if err != nil {
return err return err

3
staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go
View File

@ -250,6 +250,9 @@ func (o *ApplyOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
o.OpenAPISchema, _ = f.OpenAPISchema() o.OpenAPISchema, _ = f.OpenAPISchema()
o.Validator, err = f.Validator(cmdutil.GetFlagBool(cmd, "validate")) o.Validator, err = f.Validator(cmdutil.GetFlagBool(cmd, "validate"))
if err != nil {
return err
}
o.Builder = f.NewBuilder() o.Builder = f.NewBuilder()
o.Mapper, err = f.ToRESTMapper() o.Mapper, err = f.ToRESTMapper()
if err != nil { if err != nil {

3
staging/src/k8s.io/kubectl/pkg/cmd/label/label.go
View File

@ -181,6 +181,9 @@ func (o *LabelOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
} }
o.resources = resources o.resources = resources
o.newLabels, o.removeLabels, err = parseLabels(labelArgs) o.newLabels, o.removeLabels, err = parseLabels(labelArgs)
if err != nil {
return err
}
if o.list && len(o.outputFormat) > 0 { if o.list && len(o.outputFormat) > 0 {
return fmt.Errorf("--list and --output may not be specified together") return fmt.Errorf("--list and --output may not be specified together")