Merge pull request #409 from hypnoglow/fix-singular

🐛Fix singular argument for resource marker

Author: k8s-ci-robot

pkg/crd/markers/crd.go

@@ -277,6 +277,9 @@ func (s Resource) ApplyToCRD(crd *apiext.CustomResourceDefinitionSpec, version s
 	if s.Path != "" {
 		crd.Names.Plural = s.Path
 	}
+	if s.Singular != "" {
+		crd.Names.Singular = s.Singular
+	}
 	crd.Names.ShortNames = s.ShortName
 	crd.Names.Categories = s.Categories
 

pkg/crd/spec.go

@@ -120,7 +120,7 @@ func (p *Parser) NeedCRDFor(groupKind schema.GroupKind, maxDescLen *int) {
 		}
 	}
 
-	// fix the name if the plural was changed (this is the form the name *has* to take, so no harm in chaning it).
+	// fix the name if the plural was changed (this is the form the name *has* to take, so no harm in changing it).
 	crd.Name = crd.Spec.Names.Plural + "." + groupKind.Group
 
 	// nothing to actually write

pkg/crd/testdata/cronjob_types.go

@@ -227,7 +227,7 @@ type CronJobStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource
+// +kubebuilder:resource:singular=mycronjob
 
 // CronJob is the Schema for the cronjobs API
 type CronJob struct {

pkg/crd/testdata/testdata.kubebuilder.io_cronjobs.yaml

@@ -13,7 +13,7 @@ spec:
     kind: CronJob
     listKind: CronJobList
     plural: cronjobs
-    singular: cronjob
+    singular: mycronjob
   scope: Namespaced
   versions:
   - name: v1