diff --git a/pkg/kubectl/cmd/describe.go b/pkg/kubectl/cmd/describe.go index 9bbb7d7aeff..e3219d80774 100644 --- a/pkg/kubectl/cmd/describe.go +++ b/pkg/kubectl/cmd/describe.go @@ -51,8 +51,7 @@ var ( will first check for an exact match on TYPE and NAME_PREFIX. If no such resource exists, it will output details for every resource that has a name prefixed with NAME_PREFIX. - `) + - kubectl.PossibleResourceTypes + `) + valid_resources describe_example = dedent.Dedent(` # Describe a node diff --git a/pkg/kubectl/cmd/explain.go b/pkg/kubectl/cmd/explain.go index 0939fc8b4cb..317afc029db 100644 --- a/pkg/kubectl/cmd/explain.go +++ b/pkg/kubectl/cmd/explain.go @@ -39,7 +39,7 @@ var ( explainLong = dedent.Dedent(` Documentation of resources. - `) + kubectl.PossibleResourceTypes + `) + valid_resources ) // NewCmdExplain returns a cobra command for swagger docs diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index 40127eb6c04..3989b8afd97 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -44,7 +44,7 @@ var ( get_long = dedent.Dedent(` Display one or many resources. - `) + kubectl.PossibleResourceTypes + dedent.Dedent(` + `) + valid_resources + dedent.Dedent(` This command will hide resources that have completed. For instance, pods that are in the Succeeded or Failed phases. You can see the full results for any resource by providing the '--show-all' flag. diff --git a/pkg/kubectl/kubectl.go b/pkg/kubectl/kubectl.go index 3a6b85ca170..70e1a47d788 100644 --- a/pkg/kubectl/kubectl.go +++ b/pkg/kubectl/kubectl.go @@ -30,12 +30,6 @@ import ( const ( kubectlAnnotationPrefix = "kubectl.kubernetes.io/" - // TODO: auto-generate this - PossibleResourceTypes = `Possible resource types include (case insensitive): pods (aka 'po'), services (aka 'svc'), deployments (aka 'deploy'), -replicasets (aka 'rs'), replicationcontrollers (aka 'rc'), nodes (aka 'no'), events (aka 'ev'), limitranges (aka 'limits'), -persistentvolumes (aka 'pv'), persistentvolumeclaims (aka 'pvc'), resourcequotas (aka 'quota'), namespaces (aka 'ns'), -serviceaccounts (aka 'sa'), ingresses (aka 'ing'), horizontalpodautoscalers (aka 'hpa'), daemonsets (aka 'ds'), configmaps (aka 'cm'), -componentstatuses (aka 'cs), endpoints (aka 'ep'), petsets (alpha feature, may be unstable) and secrets.` ) type NamespaceInfo struct {