From d9405b8b891a6c5a9a4c233e7ee79e81626626b9 Mon Sep 17 00:00:00 2001 From: Rohit Ramkumar Date: Tue, 4 Sep 2018 10:10:32 -0700 Subject: [PATCH] Support short names in CRD Meta. Allows for abbreviating CRD's in kubectl --- pkg/crd/crd.go | 9 +++++---- pkg/crd/meta.go | 16 +++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkg/crd/crd.go b/pkg/crd/crd.go index 1428068975..a3bd1f74ce 100644 --- a/pkg/crd/crd.go +++ b/pkg/crd/crd.go @@ -102,10 +102,11 @@ func crd(meta *CRDMeta) *apiextensionsv1beta1.CustomResourceDefinition { Version: meta.version, Scope: apiextensionsv1beta1.NamespaceScoped, Names: apiextensionsv1beta1.CustomResourceDefinitionNames{ - Kind: meta.kind, - ListKind: meta.listKind, - Plural: meta.plural, - Singular: meta.singular, + Kind: meta.kind, + ListKind: meta.listKind, + Plural: meta.plural, + Singular: meta.singular, + ShortNames: meta.shortNames, }, }, } diff --git a/pkg/crd/meta.go b/pkg/crd/meta.go index 752e8aa251..4f1ee0881d 100644 --- a/pkg/crd/meta.go +++ b/pkg/crd/meta.go @@ -28,20 +28,22 @@ type CRDMeta struct { listKind string singular string plural string + shortNames []string typeSource string fn common.GetOpenAPIDefinitions } // NewCRDMeta creates a CRDMeta type which can be passed to a CRDHandler in // order to create/ensure a CRD. -func NewCRDMeta(groupName, version, kind, listKind, singular, plural string) *CRDMeta { +func NewCRDMeta(groupName, version, kind, listKind, singular, plural string, shortNames ...string) *CRDMeta { return &CRDMeta{ - groupName: groupName, - version: version, - kind: kind, - listKind: listKind, - singular: singular, - plural: plural, + groupName: groupName, + version: version, + kind: kind, + listKind: listKind, + singular: singular, + plural: plural, + shortNames: shortNames, } }