Let openapi code-generator handle adding shortName to CRD

redhat-developer · Aug 26, 2019 · c042dc3 · c042dc3
1 parent a585623
commit c042dc3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-// +build !ignore_autogenerated
+// +build !
 
 // This file was autogenerated by openapi-gen. Do not edit it manually!