Merge pull request #48 from pwittrock/pluralkind

Disallow pluralized Kinds when creating resources
kubernetes-sigs · Apr 3, 2018 · f6d0548 · f6d0548
2 parents 135624d + 7c5dcef
commit f6d0548
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cmd/kubebuilder/create/util/util.go b/cmd/kubebuilder/create/util/util.go
@@ -18,14 +18,14 @@ package util
 
 import (
 	"log"
+	"path/filepath"
 	"regexp"
 	"strings"
 
 	"github.com/markbates/inflect"
 	"github.com/spf13/cobra"
 
 	"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/util"
-	"path/filepath"
 )
 
 var (
@@ -44,6 +44,9 @@ func ValidateResourceFlags() {
 		log.Fatal("Must specify --kind")
 	}
 	if len(ResourceName) == 0 {
+		if inflect.NewDefaultRuleset().Pluralize(KindName) == KindName {
+			log.Fatal("Client code generation expects singular --kind.")
+		}
 		ResourceName = inflect.NewDefaultRuleset().Pluralize(strings.ToLower(KindName))
 	}