declarative pattern: Support cluster scoped types

justinsb · justinsb · commit 5c754a31dc12 · 2020-02-27T05:15:59.000-05:00
We weren't processing the Namespaced field. Equivalent of #864
diff --git a/plugins/addon/type.go b/plugins/addon/type.go
@@ -74,6 +74,7 @@ type {{.Resource.Kind}}Status struct {
 }
 
 // +kubebuilder:object:root=true
+{{ if not .Resource.Namespaced }} // +kubebuilder:resource:scope=Cluster {{ end }}
 
 // {{.Resource.Kind}} is the Schema for the {{ .Resource.Resource }} API
 type {{.Resource.Kind}} struct {
@@ -107,6 +108,7 @@ func (o *{{.Resource.Kind}}) SetCommonStatus(s addonv1alpha1.CommonStatus) {
 }
 
 // +kubebuilder:object:root=true
+{{ if not .Resource.Namespaced }} // +kubebuilder:resource:scope=Cluster {{ end }}
 
 // {{.Resource.Kind}}List contains a list of {{.Resource.Kind}}
 type {{.Resource.Kind}}List struct {

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ type {{.Resource.Kind}}Status struct {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`// +kubebuilder:object:root=true`
	`77`	`+{{ if not .Resource.Namespaced }} // +kubebuilder:resource:scope=Cluster {{ end }}`
`77`	`78`
`78`	`79`	`// {{.Resource.Kind}} is the Schema for the {{ .Resource.Resource }} API`
`79`	`80`	`type {{.Resource.Kind}} struct {`
`@@ -107,6 +108,7 @@ func (o *{{.Resource.Kind}}) SetCommonStatus(s addonv1alpha1.CommonStatus) {`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`// +kubebuilder:object:root=true`
	`111`	`+{{ if not .Resource.Namespaced }} // +kubebuilder:resource:scope=Cluster {{ end }}`
`110`	`112`
`111`	`113`	`// {{.Resource.Kind}}List contains a list of {{.Resource.Kind}}`
`112`	`114`	`type {{.Resource.Kind}}List struct {`