From 781480d7fed6b50eb9527badf79aef71313bf563 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Thu, 18 Feb 2016 14:31:08 -0800 Subject: [PATCH] Add DaemonSets and Deployments to valid resources list in kubectl. --- pkg/kubectl/cmd/cmd.go | 5 +++++ pkg/kubectl/kubectl.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 2abffaf376..c82950e60d 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -110,8 +110,13 @@ __custom_func() { esac } ` + + // If you add a resource to this list, please also take a look at pkg/kubectl/kubectl.go + // and add a short forms entry in expandResourceShortcut() when appropriate. valid_resources = `Valid resource types include: * componentstatuses (aka 'cs') + * daemonsets (aka 'ds') + * deployments * events (aka 'ev') * endpoints (aka 'ep') * horizontalpodautoscalers (aka 'hpa') diff --git a/pkg/kubectl/kubectl.go b/pkg/kubectl/kubectl.go index 60b280174a..417a4a09d5 100644 --- a/pkg/kubectl/kubectl.go +++ b/pkg/kubectl/kubectl.go @@ -100,6 +100,8 @@ func (e ShortcutExpander) ResourceSingularizer(resource string) (string, error) func expandResourceShortcut(resource unversioned.GroupVersionResource) unversioned.GroupVersionResource { shortForms := map[string]unversioned.GroupVersionResource{ // Please keep this alphabetized + // If you add an entry here, please also take a look at pkg/kubectl/cmd/cmd.go + // and add an entry to valid_resources when appropriate. "cs": api.SchemeGroupVersion.WithResource("componentstatuses"), "ds": extensions.SchemeGroupVersion.WithResource("daemonsets"), "ep": api.SchemeGroupVersion.WithResource("endpoints"),