From 068dbb44f39a3ff4c3cfaf82242c91598582ecd4 Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Fri, 2 Oct 2020 09:28:27 -0400 Subject: [PATCH 1/2] include APIVersion in output of 'kubectl api-resources' --- .../kubectl/pkg/cmd/apiresources/apiresources.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go index 0c07cfcb99f..a8d9620d419 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go @@ -71,8 +71,9 @@ type APIResourceOptions struct { // groupResource contains the APIGroup and APIResource type groupResource struct { - APIGroup string - APIResource metav1.APIResource + APIGroup string + APIGroupVersion string + APIResource metav1.APIResource } // NewAPIResourceOptions creates the options for APIResource @@ -184,8 +185,9 @@ func (o *APIResourceOptions) RunAPIResources(cmd *cobra.Command, f cmdutil.Facto continue } resources = append(resources, groupResource{ - APIGroup: gv.Group, - APIResource: resource, + APIGroup: gv.Group, + APIGroupVersion: gv.String(), + 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", r.APIResource.Name, strings.Join(r.APIResource.ShortNames, ","), - r.APIGroup, + r.APIGroupVersion, r.APIResource.Namespaced, r.APIResource.Kind, 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", r.APIResource.Name, strings.Join(r.APIResource.ShortNames, ","), - r.APIGroup, + r.APIGroupVersion, r.APIResource.Namespaced, r.APIResource.Kind); err != nil { 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 { - columnNames := []string{"NAME", "SHORTNAMES", "APIGROUP", "NAMESPACED", "KIND"} + columnNames := []string{"NAME", "SHORTNAMES", "APIVERSION", "NAMESPACED", "KIND"} if output == "wide" { columnNames = append(columnNames, "VERBS") } From 29cd320d89b286c175623a95dd7df8f2cd762c5d Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Mon, 5 Oct 2020 14:06:32 -0400 Subject: [PATCH 2/2] clarify help for --api-version: note it's API group/version --- staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go b/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go index 7d7b5202936..78dd7fd7fd1 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/explain/explain.go @@ -86,7 +86,7 @@ func NewCmdExplain(parent string, f cmdutil.Factory, streams genericclioptions.I }, } cmd.Flags().BoolVar(&o.Recursive, "recursive", o.Recursive, "Print the fields of fields (Currently only 1 level deep)") - cmd.Flags().StringVar(&o.APIVersion, "api-version", o.APIVersion, "Get different explanations for particular API version") + cmd.Flags().StringVar(&o.APIVersion, "api-version", o.APIVersion, "Get different explanations for particular API version (API group/version)") return cmd }