From c042dc3dad9fa8cca689e6a679c887a6253d28b2 Mon Sep 17 00:00:00 2001
From: Akash Shinde <akashshinde159@gmail.com>
Date: Mon, 26 Aug 2019 13:27:32 +0530
Subject: [PATCH] Let openapi code-generator handle adding shortName to CRD

---
 deploy/crds/apps_v1alpha1_servicebindingrequest_crd.yaml | 2 +-
 pkg/apis/apps/v1alpha1/servicebindingrequest_types.go    | 1 +
 pkg/apis/apps/v1alpha1/zz_generated.openapi.go           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/deploy/crds/apps_v1alpha1_servicebindingrequest_crd.yaml b/deploy/crds/apps_v1alpha1_servicebindingrequest_crd.yaml
index eb18b7c723..007a29bd94 100644
--- a/deploy/crds/apps_v1alpha1_servicebindingrequest_crd.yaml
+++ b/deploy/crds/apps_v1alpha1_servicebindingrequest_crd.yaml
@@ -8,10 +8,10 @@ spec:
     kind: ServiceBindingRequest
     listKind: ServiceBindingRequestList
     plural: servicebindingrequests
-    singular: servicebindingrequest
     shortNames:
     - sbr
     - sbrs
+    singular: servicebindingrequest
   scope: Namespaced
   subresources:
     status: {}
diff --git a/pkg/apis/apps/v1alpha1/servicebindingrequest_types.go b/pkg/apis/apps/v1alpha1/servicebindingrequest_types.go
index d9e0610e27..f091131894 100644
--- a/pkg/apis/apps/v1alpha1/servicebindingrequest_types.go
+++ b/pkg/apis/apps/v1alpha1/servicebindingrequest_types.go
@@ -62,6 +62,7 @@ type ApplicationSelector struct {
 // ServiceBindingRequest is the Schema for the servicebindings API
 // +k8s:openapi-gen=true
 // +kubebuilder:subresource:status
+// +kubebuilder:resource:path=servicebindingrequests,shortName=sbr;sbrs
 type ServiceBindingRequest struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
diff --git a/pkg/apis/apps/v1alpha1/zz_generated.openapi.go b/pkg/apis/apps/v1alpha1/zz_generated.openapi.go
index 1a02ba1cb1..b133f01b40 100644
--- a/pkg/apis/apps/v1alpha1/zz_generated.openapi.go
+++ b/pkg/apis/apps/v1alpha1/zz_generated.openapi.go
@@ -1,4 +1,4 @@
-// +build !ignore_autogenerated
+// +build !
 
 // This file was autogenerated by openapi-gen. Do not edit it manually!