github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73035 from juanvallejo/jvallejo/make-apiresource-discovery-nonfatal 

make api-resource discovery errors non-fatal
pull/564/head
Kubernetes Prow Robot 2019-01-21 14:20:43 -08:00 committed by GitHub
parent f788854e98 23d52b4829
commit 0a7d8ec6cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/apiresources/BUILD
View File

@ -15,6 +15,7 @@ go_library(
"//pkg/kubectl/util/templates:go_default_library", "//pkg/kubectl/util/templates:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
"//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library",

14
pkg/kubectl/cmd/apiresources/apiresources.go
View File

@ -26,6 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@ -136,9 +137,10 @@ func (o *APIResourceOptions) RunAPIResources(cmd *cobra.Command, f cmdutil.Facto
discoveryclient.Invalidate() discoveryclient.Invalidate()
} }
errs := []error{}
lists, err := discoveryclient.ServerPreferredResources() lists, err := discoveryclient.ServerPreferredResources()
if err != nil { if err != nil {
return err errs = append(errs, err)
} }
resources := []groupResource{} resources := []groupResource{}
@ -192,7 +194,7 @@ func (o *APIResourceOptions) RunAPIResources(cmd *cobra.Command, f cmdutil.Facto
name += "." + r.APIGroup name += "." + r.APIGroup
} }
if _, err := fmt.Fprintf(w, "%s\n", name); err != nil { if _, err := fmt.Fprintf(w, "%s\n", name); err != nil {
return err errs = append(errs, err)
} }
case "wide": case "wide":
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%v\t%s\t%v\n", if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%v\t%s\t%v\n",
@ -202,7 +204,7 @@ func (o *APIResourceOptions) RunAPIResources(cmd *cobra.Command, f cmdutil.Facto
r.APIResource.Namespaced, r.APIResource.Namespaced,
r.APIResource.Kind, r.APIResource.Kind,
r.APIResource.Verbs); err != nil { r.APIResource.Verbs); err != nil {
return err errs = append(errs, err)
} }
case "": case "":
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%v\t%s\n", if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%v\t%s\n",
@ -211,10 +213,14 @@ func (o *APIResourceOptions) RunAPIResources(cmd *cobra.Command, f cmdutil.Facto
r.APIGroup, r.APIGroup,
r.APIResource.Namespaced, r.APIResource.Namespaced,
r.APIResource.Kind); err != nil { r.APIResource.Kind); err != nil {
return err errs = append(errs, err)
} }
} }
} }
if len(errs) > 0 {
return errors.NewAggregate(errs)
}
return nil return nil
} }