diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index 1c412b89bb8..4dd0765ebcf 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -103,16 +103,21 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string if len(args) == 0 { fmt.Fprint(out, ` You must specify the type of resource to get. Valid resource types include: - * pods (aka 'po') - * replicationcontrollers (aka 'rc') - * services - * nodes (aka 'no') + * componentStatuses (aka 'cs') + * endpoints (aka 'ep') * events (aka 'ev') - * secrets * limits - * persistentVolumes (aka 'pv') + * namespaces + * nodes (aka 'no') * persistentVolumeClaims (aka 'pvc') + * persistentVolumes (aka 'pv') + * pods (aka 'po') + * podTemplates * quota + * replicationcontrollers (aka 'rc') + * secrets + * serviceAccounts + * services `) return errors.New("Required resource not specified.") } diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index e147f95cab8..030face3f86 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -254,6 +254,8 @@ func (h *HumanReadablePrinter) HandledResources() []string { return keys } +// NOTE: When adding a new resource type here, please update the list +// pkg/kubectl/cmd/get.go to reflect the new resource type. var podColumns = []string{"NAME", "READY", "STATUS", "RESTARTS", "AGE"} var podTemplateColumns = []string{"TEMPLATE", "CONTAINER(S)", "IMAGE(S)", "PODLABELS"} var replicationControllerColumns = []string{"CONTROLLER", "CONTAINER(S)", "IMAGE(S)", "SELECTOR", "REPLICAS"}