From c4fe8f11b200d0a97e8ce447e5af592b5c4870d0 Mon Sep 17 00:00:00 2001 From: haoshuwei Date: Mon, 9 Sep 2019 13:54:14 +0800 Subject: [PATCH 1/2] fix some missing errors return statements Signed-off-by: haoshuwei --- .../k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go | 3 +++ staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go | 3 +++ staging/src/k8s.io/kubectl/pkg/cmd/label/label.go | 3 +++ 3 files changed, 9 insertions(+) diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go index 3ff84038006..b0b59cf8205 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun.go @@ -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 diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go index 915f055ea43..f77ae91341e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go @@ -251,6 +251,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 { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/label.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label.go index 48a379bf038..f950ba26561 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/label.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/label.go @@ -182,6 +182,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") From ef0fe263aa9f24147370c22f923988ad8f8aa172 Mon Sep 17 00:00:00 2001 From: haoshuwei Date: Mon, 9 Sep 2019 18:57:44 +0800 Subject: [PATCH 2/2] remove packages in hack/.staticcheck_failures which are passing staticcheck Signed-off-by: haoshuwei --- hack/.staticcheck_failures | 2 -- 1 file changed, 2 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 4e325233cb4..660e0288c2c 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -226,12 +226,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