Merge pull request #276 from pmorie/categories-controller-install

Add categories to the CRD installed by the controller
kubernetes-sigs · Jun 21, 2018 · a523fb6 · a523fb6
2 parents 2ca8b7a + ee77a60
commit a523fb6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/cmd/internal/codegen/parse/crd.go b/cmd/internal/codegen/parse/crd.go
@@ -77,7 +77,9 @@ func (b *APIs) parseCRDs() {
 
 					if HasCategories(resource.Type) {
 						categoriesTag := getCategoriesTag(resource.Type)
-						resource.CRD.Spec.Names.Categories = strings.Split(categoriesTag, ",")
+						categories := strings.Split(categoriesTag, ",")
+						resource.CRD.Spec.Names.Categories = categories
+						resource.Categories = categories
 					}
 
 					if HasStatusSubresource(resource.Type) {

diff --git a/cmd/internal/codegen/types.go b/cmd/internal/codegen/types.go
@@ -166,6 +166,8 @@ type APIResource struct {
 	DocAnnotation map[string]string
 	// HasStatusSubresource indicates that the resource has a status subresource
 	HasStatusSubresource bool
+	// Categories is a list of categories the resource is part of.
+	Categories []string
 }
 
 type APISubresource struct {

diff --git a/cmd/kubebuilder-gen/internal/resourcegen/versioned_generator.go b/cmd/kubebuilder-gen/internal/resourcegen/versioned_generator.go
@@ -127,6 +127,13 @@ var (
                 {{ if .ShortName -}}
                 ShortNames: []string{"{{.ShortName}}"},
                 {{ end -}}
+                {{ if .Categories -}}
+                Categories: []string{
+                {{ range .Categories -}}
+                    "{{ . }}",
+                {{ end -}}
+                },
+                {{ end -}}
             },
             {{ if .NonNamespaced -}}
             Scope: "Cluster",

diff --git a/cmd/kubebuilder/create/resource/resource.go b/cmd/kubebuilder/create/resource/resource.go
@@ -36,6 +36,7 @@ type resourceTemplateArgs struct {
 	PluralizedKind       string
 	NonNamespacedKind    bool
 	HasStatusSubresource bool
+	Categories           []string
 }
 
 func doResource(dir string, args resourceTemplateArgs) bool {

diff --git a/cmd/kubebuilder/create/resource/run.go b/cmd/kubebuilder/create/resource/run.go
@@ -110,6 +110,7 @@ func createResource(boilerplate string) {
 		inflect.NewDefaultRuleset().Pluralize(createutil.KindName),
 		nonNamespacedKind,
 		false,
+		nil,
 	}
 
 	dir, err := os.Getwd()