Merge pull request #24087 from Frostman/kubectl-abbr-dpl

Automatic merge from submit-queue Add "deploy" abbrev for deployments to kubectl Most of the objects have the abbreviation (short form) in kubectl, for ex. rc == replicationcontroller. It'll be useful to have an abbrev for "deployments" as well and I'm proposing to use "dpl" for it. P.S. It's my very first commit to k8s. I've signed CLA already. I've decided to create this pull request while waiting on more info in #24083.  --- This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/24087)

Merge pull request #24087 from Frostman/kubectl-abbr-dpl
4018101a · k8s-merge-robot · GitHub · 5894dc46 · 3c0f0474 · 4018101a
Commit 4018101a authored Jul 12, 2016 by k8s-merge-robot Committed by GitHub Jul 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cmd.go pkg/kubectl/cmd/cmd.go +1 -1

kubectl.go pkg/kubectl/kubectl.go +2 -1

No files found.
--- a/pkg/kubectl/cmd/cmd.go
+++ b/pkg/kubectl/cmd/cmd.go
@@ -160,7 +160,7 @@ __custom_func() {
   * componentstatuses (aka 'cs')
   * configmaps
   * daemonsets (aka 'ds')
-   * deployments
+   * deployments (aka 'deploy')
   * events (aka 'ev')
   * endpoints (aka 'ep')
   * horizontalpodautoscalers (aka 'hpa')

--- a/pkg/kubectl/kubectl.go
+++ b/pkg/kubectl/kubectl.go
@@ -31,7 +31,7 @@ import (
 const (
 	kubectlAnnotationPrefix = "kubectl.kubernetes.io/"
 	// TODO: auto-generate this
-	PossibleResourceTypes = `Possible resource types include (case insensitive): pods (aka 'po'), services (aka 'svc'), deployments,
+	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,
@@ -145,6 +145,7 @@ var shortForms = map[string]string{
 	// 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":     "componentstatuses",
+	"deploy": "deployments",
 	"ds":     "daemonsets",
 	"ep":     "endpoints",
 	"ev":     "events",