Add --plural flag to kubebuilder create api and update the v3 flag fo…

…r kubebuilder create webhook from --resource to --plural Signed-off-by: Adrian Orive <[email protected]>
kubernetes-sigs · Nov 17, 2020 · 60db31a · 60db31a
1 parent cd3cb2a
commit 60db31a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/pkg/model/config/config.go b/pkg/model/config/config.go
@@ -148,6 +148,7 @@ type GVK struct {
 	Group   string `json:"group,omitempty"`
 	Version string `json:"version,omitempty"`
 	Kind    string `json:"kind,omitempty"`
+	Plural  string `json:"plural,omitempty"`
 
 	// CRDVersion holds the CustomResourceDefinition API version used for the GVK.
 	CRDVersion string `json:"crdVersion,omitempty"`
@@ -159,7 +160,8 @@ type GVK struct {
 func (r GVK) isEqualTo(other GVK) bool {
 	return r.Group == other.Group &&
 		r.Version == other.Version &&
-		r.Kind == other.Kind
+		r.Kind == other.Kind &&
+		r.Plural == other.Plural
 }
 
 // merge combines fields of two GVKs that have matching group, version, and kind,

diff --git a/pkg/model/resource/resource.go b/pkg/model/resource/resource.go
@@ -20,6 +20,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gobuffalo/flect"
+
 	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
 )
 
@@ -60,13 +62,20 @@ type Resource struct {
 
 // GVK returns the group-version-kind information to check against tracked resources in the configuration file
 func (r *Resource) GVK() config.GVK {
-	return config.GVK{
+	gvk := config.GVK{
 		Group:          r.Group,
 		Version:        r.Version,
 		Kind:           r.Kind,
 		CRDVersion:     r.CRDVersion,
 		WebhookVersion: r.WebhookVersion,
 	}
+
+	// Only store plural if it is irregular
+	if r.Plural != flect.Pluralize(strings.ToLower(r.Kind)) {
+		gvk.Plural = r.Plural
+	}
+
+	return gvk
 }
 
 func wrapKey(key string) string {

diff --git a/pkg/plugin/v2/webhook.go b/pkg/plugin/v2/webhook.go
@@ -67,7 +67,7 @@ func (p *createWebhookSubcommand) BindFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&p.resource.Group, "group", "", "resource Group")
 	fs.StringVar(&p.resource.Version, "version", "", "resource Version")
 	fs.StringVar(&p.resource.Kind, "kind", "", "resource Kind")
-	fs.StringVar(&p.resource.Plural, "resource", "", "resource Resource")
+	fs.StringVar(&p.resource.Plural, "resource", "", "resource kind irregular plural form")
 
 	fs.BoolVar(&p.defaulting, "defaulting", false,
 		"if set, scaffold the defaulting webhook")

diff --git a/pkg/plugin/v3/api.go b/pkg/plugin/v3/api.go
@@ -128,6 +128,7 @@ func (p *createAPISubcommand) BindFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&p.resource.Kind, "kind", "", "resource Kind")
 	fs.StringVar(&p.resource.Group, "group", "", "resource Group")
 	fs.StringVar(&p.resource.Version, "version", "", "resource Version")
+	fs.StringVar(&p.resource.Plural, "plural", "", "resource kind irregular plural form")
 	fs.BoolVar(&p.resource.Namespaced, "namespaced", true, "resource is namespaced")
 	fs.StringVar(&p.resource.CRDVersion, "crd-version", defaultCRDVersion,
 		"version of CustomResourceDefinition to scaffold. Options: [v1, v1beta1]")

diff --git a/pkg/plugin/v3/webhook.go b/pkg/plugin/v3/webhook.go
@@ -67,10 +67,10 @@ validating and (or) conversion webhooks.
 
 func (p *createWebhookSubcommand) BindFlags(fs *pflag.FlagSet) {
 	p.resource = &resource.Options{}
+	fs.StringVar(&p.resource.Kind, "kind", "", "resource Kind")
 	fs.StringVar(&p.resource.Group, "group", "", "resource Group")
 	fs.StringVar(&p.resource.Version, "version", "", "resource Version")
-	fs.StringVar(&p.resource.Kind, "kind", "", "resource Kind")
-	fs.StringVar(&p.resource.Plural, "resource", "", "resource Resource")
+	fs.StringVar(&p.resource.Plural, "plural", "", "resource kind irregular plural form")
 	fs.StringVar(&p.resource.WebhookVersion, "webhook-version", defaultWebhookVersion,
 		"version of {Mutating,Validating}WebhookConfigurations to scaffold. Options: [v1, v1beta1]")