Fixes kubernetes-sigs#152

Allow plural resource names.
pwittrock · May 14, 2018 · 8a7b21b · 8a7b21b
1 parent b8eff8f
commit 8a7b21b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cmd/kubebuilder/create/resource/run.go b/cmd/kubebuilder/create/resource/run.go
@@ -62,6 +62,7 @@ func AddCreateResource(cmd *cobra.Command) {
 	createResourceCmd.Flags().BoolVar(&nonNamespacedKind, "non-namespaced", false, "if set, the API kind will be non namespaced")
 	createResourceCmd.Flags().BoolVar(&controller, "controller", true, "if true, generate the controller code for the resource")
 	createResourceCmd.Flags().BoolVar(&generate, "generate", true, "generate source code")
+	createResourceCmd.Flags().BoolVar(&createutil.AllowPluralKind, "plural-kind", false, "allow the kind to be plural")
 	cmd.AddCommand(createResourceCmd)
 }
 

diff --git a/cmd/kubebuilder/create/util/util.go b/cmd/kubebuilder/create/util/util.go
@@ -30,6 +30,7 @@ import (
 
 var (
 	GroupName, KindName, VersionName, ResourceName, Copyright string
+	AllowPluralKind                                           bool
 )
 
 func ValidateResourceFlags() {
@@ -43,11 +44,14 @@ func ValidateResourceFlags() {
 	if len(KindName) == 0 {
 		log.Fatal("Must specify --kind")
 	}
+
+	rs := inflect.NewDefaultRuleset()
 	if len(ResourceName) == 0 {
-		if inflect.NewDefaultRuleset().Pluralize(KindName) == KindName {
-			log.Fatal("Client code generation expects singular --kind.")
+		if !AllowPluralKind && rs.Pluralize(KindName) == KindName && rs.Singularize(KindName) != KindName {
+			log.Fatalf("Client code generation expects singular --kind (e.g. %s)."+
+				"Or to be run with --pural-kind=true.", rs.Singularize(KindName))
 		}
-		ResourceName = inflect.NewDefaultRuleset().Pluralize(strings.ToLower(KindName))
+		ResourceName = rs.Pluralize(strings.ToLower(KindName))
 	}
 
 	groupMatch := regexp.MustCompile("^[a-z]+$")