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

include APIVersion in output of 'kubectl api-resources'

Browse Source
This commit is contained in:
Sally O'Malley 2020-10-02 09:28:27 -04:00
parent 613ee7f0db
commit 068dbb44f3
No known key found for this signature in database
GPG Key ID: 9AD4DAB10C905B8C
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go
View File

@ -72,6 +72,7 @@ type APIResourceOptions struct {
// groupResource contains the APIGroup and APIResource // groupResource contains the APIGroup and APIResource
type groupResource struct { type groupResource struct {
APIGroup string APIGroup string
APIGroupVersion string
APIResource metav1.APIResource APIResource metav1.APIResource
} }
@ -185,6 +186,7 @@ func (o *APIResourceOptions) RunAPIResources(cmd *cobra.Command, f cmdutil.Facto
} }
resources = append(resources, groupResource{ resources = append(resources, groupResource{
APIGroup: gv.Group, APIGroup: gv.Group,
APIGroupVersion: gv.String(),
APIResource: resource, APIResource: resource,
}) })
} }
@ -211,7 +213,7 @@ func (o *APIResourceOptions) RunAPIResources(cmd *cobra.Command, f cmdutil.Facto
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",
r.APIResource.Name, r.APIResource.Name,
strings.Join(r.APIResource.ShortNames, ","), strings.Join(r.APIResource.ShortNames, ","),
r.APIGroup, r.APIGroupVersion,
r.APIResource.Namespaced, r.APIResource.Namespaced,
r.APIResource.Kind, r.APIResource.Kind,
r.APIResource.Verbs); err != nil { r.APIResource.Verbs); err != nil {
@ -221,7 +223,7 @@ func (o *APIResourceOptions) RunAPIResources(cmd *cobra.Command, f cmdutil.Facto
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",
r.APIResource.Name, r.APIResource.Name,
strings.Join(r.APIResource.ShortNames, ","), strings.Join(r.APIResource.ShortNames, ","),
r.APIGroup, r.APIGroupVersion,
r.APIResource.Namespaced, r.APIResource.Namespaced,
r.APIResource.Kind); err != nil { r.APIResource.Kind); err != nil {
errs = append(errs, err) errs = append(errs, err)
@ -236,7 +238,7 @@ func (o *APIResourceOptions) RunAPIResources(cmd *cobra.Command, f cmdutil.Facto
} }
func printContextHeaders(out io.Writer, output string) error { func printContextHeaders(out io.Writer, output string) error {
columnNames := []string{"NAME", "SHORTNAMES", "APIGROUP", "NAMESPACED", "KIND"} columnNames := []string{"NAME", "SHORTNAMES", "APIVERSION", "NAMESPACED", "KIND"}
if output == "wide" { if output == "wide" {
columnNames = append(columnNames, "VERBS") columnNames = append(columnNames, "VERBS")
} }