Skip to content

Commit 5b496d2

Browse files
authored
Merge pull request kubernetes#82477 from haoshuwei/add-missing-err-return
fix some missing errors return statements
2 parents d1c6898 + ef0fe26 commit 5b496d2

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

hack/.staticcheck_failures

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,10 @@ vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper
225225
vendor/k8s.io/kube-aggregator/pkg/controllers/autoregister
226226
vendor/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator
227227
vendor/k8s.io/kubectl/pkg/cmd/annotate
228-
vendor/k8s.io/kubectl/pkg/cmd/apply
229228
vendor/k8s.io/kubectl/pkg/cmd/certificates
230229
vendor/k8s.io/kubectl/pkg/cmd/config
231230
vendor/k8s.io/kubectl/pkg/cmd/edit
232231
vendor/k8s.io/kubectl/pkg/cmd/exec
233-
vendor/k8s.io/kubectl/pkg/cmd/label
234232
vendor/k8s.io/kubectl/pkg/cmd/proxy
235233
vendor/k8s.io/kubectl/pkg/cmd/rollingupdate
236234
vendor/k8s.io/kubectl/pkg/cmd/scale

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ func (s *DryRunnableStorage) GuaranteedUpdate(
9090
return err
9191
}
9292
rev, err := s.Versioner().ObjectResourceVersion(ptrToType)
93+
if err != nil {
94+
return err
95+
}
9396
out, _, err := tryUpdate(ptrToType, storage.ResponseMeta{ResourceVersion: rev})
9497
if err != nil {
9598
return err

staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,9 @@ func (o *ApplyOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
250250

251251
o.OpenAPISchema, _ = f.OpenAPISchema()
252252
o.Validator, err = f.Validator(cmdutil.GetFlagBool(cmd, "validate"))
253+
if err != nil {
254+
return err
255+
}
253256
o.Builder = f.NewBuilder()
254257
o.Mapper, err = f.ToRESTMapper()
255258
if err != nil {

staging/src/k8s.io/kubectl/pkg/cmd/label/label.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ func (o *LabelOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
181181
}
182182
o.resources = resources
183183
o.newLabels, o.removeLabels, err = parseLabels(labelArgs)
184+
if err != nil {
185+
return err
186+
}
184187

185188
if o.list && len(o.outputFormat) > 0 {
186189
return fmt.Errorf("--list and --output may not be specified together")

0 commit comments

Comments
 (0)