Authz tweaks

Rename ProjectRoleTemplate to RoleTemplate
Explicitly refernce PodSecurityTemplates in RoleTemplate
Drop ClusterRoleTemplate

apis/management.cattle.io/v3/auth_types.go

@@ -18,14 +18,15 @@ type ProjectSpec struct {
 	ClusterName string `json:"clusterName,omitempty" norman:"required,type=reference[cluster]"`
 }
 
-type ProjectRoleTemplate struct {
+type RoleTemplate struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	Rules   []rbacv1.PolicyRule `json:"rules,omitempty"`
 	Builtin bool                `json:"builtin"`
 
-	ProjectRoleTemplateNames []string `json:"projectRoleTemplateNames,omitempty" norman:"type=array[reference[projectRoleTemplate]]"`
+	RoleTemplateNames              []string `json:"roleTemplateNames,omitempty" norman:"type=array[reference[roleTemplate]]"`
+	PodSecurityPolicyTemplateNames []string `json:"podSecurityPolicyTemplateNames,omitempty" norman:"type=array[reference[podSecurityPolicyTemplate]]"`
 }
 
 type PodSecurityPolicyTemplate struct {
@@ -41,18 +42,8 @@ type ProjectRoleTemplateBinding struct {
 
 	Subject rbacv1.Subject `json:"subject,omitempty"`
 
-	ProjectName             string `json:"projectName,omitempty" norman:"type=reference[project]"`
-	ProjectRoleTemplateName string `json:"projectRoleTemplateName,omitempty" norman:"type=reference[projectRoleTemplate]"`
-}
-
-type ClusterRoleTemplate struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Rules   []rbacv1.PolicyRule `json:"rules,omitempty"`
-	Builtin bool                `json:"builtin"`
-
-	ClusterRoleTemplateNames []string `json:"clusterRoleTemplateNames,omitempty" norman:"type=array[reference[clusterRoleTemplate]]"`
+	ProjectName      string `json:"projectName,omitempty" norman:"type=reference[project]"`
+	RoleTemplateName string `json:"roleTemplateName,omitempty" norman:"type=reference[roleTemplate]"`
 }
 
 type ClusterRoleTemplateBinding struct {
@@ -61,6 +52,6 @@ type ClusterRoleTemplateBinding struct {
 
 	Subject rbacv1.Subject `json:"subject,omitempty"`
 
-	ClusterName             string `json:"clusterName,omitempty" norman:"type=reference[cluster]"`
-	ClusterRoleTemplateName string `json:"clusterRoleTemplateName,omitempty" norman:"type=reference[clusterRoleTemplate]"`
+	ClusterName      string `json:"clusterName,omitempty" norman:"type=reference[cluster]"`
+	RoleTemplateName string `json:"roleTemplateName,omitempty" norman:"type=reference[roleTemplate]"`
 }

apis/management.cattle.io/v3/schema/schema.go

@@ -82,9 +82,8 @@ func authTypes(schemas *types.Schemas) *types.Schemas {
 		MustImportAndCustomize(&Version, v3.Project{}, func(schema *types.Schema) {
 			schema.SubContext = "projects"
 		}).
-		MustImport(&Version, v3.ProjectRoleTemplate{}).
+		MustImport(&Version, v3.RoleTemplate{}).
 		MustImport(&Version, v3.PodSecurityPolicyTemplate{}).
-		MustImport(&Version, v3.ClusterRoleTemplate{}).
 		MustImport(&Version, v3.ClusterRoleTemplateBinding{}).
 		MustImportAndCustomize(&Version, v3.ProjectRoleTemplateBinding{}, func(schema *types.Schema) {
 			schema.MustCustomizeField("subjectKind", func(field types.Field) types.Field {

apis/management.cattle.io/v3/zz_generated_cluster_role_template_controller.go

@@ -1,187 +0,0 @@
-package v3
-
-import (
-	"context"
-
-	"github.com/rancher/norman/clientbase"
-	"github.com/rancher/norman/controller"
-	"k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/tools/cache"
-)
-
-var (
-	ClusterRoleTemplateGroupVersionKind = schema.GroupVersionKind{
-		Version: "v3",
-		Group:   "management.cattle.io",
-		Kind:    "ClusterRoleTemplate",
-	}
-	ClusterRoleTemplateResource = metav1.APIResource{
-		Name:         "clusterroletemplates",
-		SingularName: "clusterroletemplate",
-		Namespaced:   false,
-		Kind:         ClusterRoleTemplateGroupVersionKind.Kind,
-	}
-)
-
-type ClusterRoleTemplateList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ClusterRoleTemplate
-}
-
-type ClusterRoleTemplateHandlerFunc func(key string, obj *ClusterRoleTemplate) error
-
-type ClusterRoleTemplateLister interface {
-	List(namespace string, selector labels.Selector) (ret []*ClusterRoleTemplate, err error)
-	Get(namespace, name string) (*ClusterRoleTemplate, error)
-}
-
-type ClusterRoleTemplateController interface {
-	Informer() cache.SharedIndexInformer
-	Lister() ClusterRoleTemplateLister
-	AddHandler(handler ClusterRoleTemplateHandlerFunc)
-	Enqueue(namespace, name string)
-	Sync(ctx context.Context) error
-	Start(ctx context.Context, threadiness int) error
-}
-
-type ClusterRoleTemplateInterface interface {
-	ObjectClient() *clientbase.ObjectClient
-	Create(*ClusterRoleTemplate) (*ClusterRoleTemplate, error)
-	Get(name string, opts metav1.GetOptions) (*ClusterRoleTemplate, error)
-	Update(*ClusterRoleTemplate) (*ClusterRoleTemplate, error)
-	Delete(name string, options *metav1.DeleteOptions) error
-	List(opts metav1.ListOptions) (*ClusterRoleTemplateList, error)
-	Watch(opts metav1.ListOptions) (watch.Interface, error)
-	DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error
-	Controller() ClusterRoleTemplateController
-}
-
-type clusterRoleTemplateLister struct {
-	controller *clusterRoleTemplateController
-}
-
-func (l *clusterRoleTemplateLister) List(namespace string, selector labels.Selector) (ret []*ClusterRoleTemplate, err error) {
-	err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) {
-		ret = append(ret, obj.(*ClusterRoleTemplate))
-	})
-	return
-}
-
-func (l *clusterRoleTemplateLister) Get(namespace, name string) (*ClusterRoleTemplate, error) {
-	obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name)
-	if err != nil {
-		return nil, err
-	}
-	if !exists {
-		return nil, errors.NewNotFound(schema.GroupResource{
-			Group:    ClusterRoleTemplateGroupVersionKind.Group,
-			Resource: "clusterRoleTemplate",
-		}, name)
-	}
-	return obj.(*ClusterRoleTemplate), nil
-}
-
-type clusterRoleTemplateController struct {
-	controller.GenericController
-}
-
-func (c *clusterRoleTemplateController) Lister() ClusterRoleTemplateLister {
-	return &clusterRoleTemplateLister{
-		controller: c,
-	}
-}
-
-func (c *clusterRoleTemplateController) AddHandler(handler ClusterRoleTemplateHandlerFunc) {
-	c.GenericController.AddHandler(func(key string) error {
-		obj, exists, err := c.Informer().GetStore().GetByKey(key)
-		if err != nil {
-			return err
-		}
-		if !exists {
-			return handler(key, nil)
-		}
-		return handler(key, obj.(*ClusterRoleTemplate))
-	})
-}
-
-type clusterRoleTemplateFactory struct {
-}
-
-func (c clusterRoleTemplateFactory) Object() runtime.Object {
-	return &ClusterRoleTemplate{}
-}
-
-func (c clusterRoleTemplateFactory) List() runtime.Object {
-	return &ClusterRoleTemplateList{}
-}
-
-func (s *clusterRoleTemplateClient) Controller() ClusterRoleTemplateController {
-	s.client.Lock()
-	defer s.client.Unlock()
-
-	c, ok := s.client.clusterRoleTemplateControllers[s.ns]
-	if ok {
-		return c
-	}
-
-	genericController := controller.NewGenericController(ClusterRoleTemplateGroupVersionKind.Kind+"Controller",
-		s.objectClient)
-
-	c = &clusterRoleTemplateController{
-		GenericController: genericController,
-	}
-
-	s.client.clusterRoleTemplateControllers[s.ns] = c
-	s.client.starters = append(s.client.starters, c)
-
-	return c
-}
-
-type clusterRoleTemplateClient struct {
-	client       *Client
-	ns           string
-	objectClient *clientbase.ObjectClient
-	controller   ClusterRoleTemplateController
-}
-
-func (s *clusterRoleTemplateClient) ObjectClient() *clientbase.ObjectClient {
-	return s.objectClient
-}
-
-func (s *clusterRoleTemplateClient) Create(o *ClusterRoleTemplate) (*ClusterRoleTemplate, error) {
-	obj, err := s.objectClient.Create(o)
-	return obj.(*ClusterRoleTemplate), err
-}
-
-func (s *clusterRoleTemplateClient) Get(name string, opts metav1.GetOptions) (*ClusterRoleTemplate, error) {
-	obj, err := s.objectClient.Get(name, opts)
-	return obj.(*ClusterRoleTemplate), err
-}
-
-func (s *clusterRoleTemplateClient) Update(o *ClusterRoleTemplate) (*ClusterRoleTemplate, error) {
-	obj, err := s.objectClient.Update(o.Name, o)
-	return obj.(*ClusterRoleTemplate), err
-}
-
-func (s *clusterRoleTemplateClient) Delete(name string, options *metav1.DeleteOptions) error {
-	return s.objectClient.Delete(name, options)
-}
-
-func (s *clusterRoleTemplateClient) List(opts metav1.ListOptions) (*ClusterRoleTemplateList, error) {
-	obj, err := s.objectClient.List(opts)
-	return obj.(*ClusterRoleTemplateList), err
-}
-
-func (s *clusterRoleTemplateClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return s.objectClient.Watch(opts)
-}
-
-func (s *clusterRoleTemplateClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error {
-	return s.objectClient.DeleteCollection(deleteOpts, listOpts)
-}

apis/management.cattle.io/v3/zz_generated_cluster_role_template_lifecycle_adapter.go

@@ -1,39 +0,0 @@
-package v3
-
-import (
-	"github.com/rancher/norman/lifecycle"
-	"k8s.io/apimachinery/pkg/runtime"
-)
-
-type ClusterRoleTemplateLifecycle interface {
-	Create(obj *ClusterRoleTemplate) error
-	Remove(obj *ClusterRoleTemplate) error
-	Updated(obj *ClusterRoleTemplate) error
-}
-
-type clusterRoleTemplateLifecycleAdapter struct {
-	lifecycle ClusterRoleTemplateLifecycle
-}
-
-func (w *clusterRoleTemplateLifecycleAdapter) Create(obj runtime.Object) error {
-	return w.lifecycle.Create(obj.(*ClusterRoleTemplate))
-}
-
-func (w *clusterRoleTemplateLifecycleAdapter) Finalize(obj runtime.Object) error {
-	return w.lifecycle.Remove(obj.(*ClusterRoleTemplate))
-}
-
-func (w *clusterRoleTemplateLifecycleAdapter) Updated(obj runtime.Object) error {
-	return w.lifecycle.Updated(obj.(*ClusterRoleTemplate))
-}
-
-func NewClusterRoleTemplateLifecycleAdapter(name string, client ClusterRoleTemplateInterface, l ClusterRoleTemplateLifecycle) ClusterRoleTemplateHandlerFunc {
-	adapter := &clusterRoleTemplateLifecycleAdapter{lifecycle: l}
-	syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient())
-	return func(key string, obj *ClusterRoleTemplate) error {
-		if obj == nil {
-			return syncFn(key, nil)
-		}
-		return syncFn(key, obj)
-	}
-}

apis/management.cattle.io/v3/zz_generated_deepcopy.go

@@ -295,45 +295,6 @@ func (in *ClusterList) DeepCopyObject() runtime.Object {
 	}
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterRoleTemplate) DeepCopyInto(out *ClusterRoleTemplate) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]rbac_v1.PolicyRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ClusterRoleTemplateNames != nil {
-		in, out := &in.ClusterRoleTemplateNames, &out.ClusterRoleTemplateNames
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplate.
-func (in *ClusterRoleTemplate) DeepCopy() *ClusterRoleTemplate {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterRoleTemplate)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ClusterRoleTemplate) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	} else {
-		return nil
-	}
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterRoleTemplateBinding) DeepCopyInto(out *ClusterRoleTemplateBinding) {
 	*out = *in
@@ -396,40 +357,6 @@ func (in *ClusterRoleTemplateBindingList) DeepCopyObject() runtime.Object {
 	}
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ClusterRoleTemplateList) DeepCopyInto(out *ClusterRoleTemplateList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ClusterRoleTemplate, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleTemplateList.
-func (in *ClusterRoleTemplateList) DeepCopy() *ClusterRoleTemplateList {
-	if in == nil {
-		return nil
-	}
-	out := new(ClusterRoleTemplateList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ClusterRoleTemplateList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	} else {
-		return nil
-	}
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
 	*out = *in
@@ -1251,45 +1178,6 @@ func (in *ProjectList) DeepCopyObject() runtime.Object {
 	}
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ProjectRoleTemplate) DeepCopyInto(out *ProjectRoleTemplate) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]rbac_v1.PolicyRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ProjectRoleTemplateNames != nil {
-		in, out := &in.ProjectRoleTemplateNames, &out.ProjectRoleTemplateNames
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplate.
-func (in *ProjectRoleTemplate) DeepCopy() *ProjectRoleTemplate {
-	if in == nil {
-		return nil
-	}
-	out := new(ProjectRoleTemplate)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ProjectRoleTemplate) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	} else {
-		return nil
-	}
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ProjectRoleTemplateBinding) DeepCopyInto(out *ProjectRoleTemplateBinding) {
 	*out = *in
@@ -1352,40 +1240,6 @@ func (in *ProjectRoleTemplateBindingList) DeepCopyObject() runtime.Object {
 	}
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ProjectRoleTemplateList) DeepCopyInto(out *ProjectRoleTemplateList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ProjectRoleTemplate, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectRoleTemplateList.
-func (in *ProjectRoleTemplateList) DeepCopy() *ProjectRoleTemplateList {
-	if in == nil {
-		return nil
-	}
-	out := new(ProjectRoleTemplateList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ProjectRoleTemplateList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	} else {
-		return nil
-	}
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ProjectSpec) DeepCopyInto(out *ProjectSpec) {
 	*out = *in
@@ -1499,6 +1353,84 @@ func (in *RancherKubernetesEngineConfig) DeepCopy() *RancherKubernetesEngineConf
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RoleTemplate) DeepCopyInto(out *RoleTemplate) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	if in.Rules != nil {
+		in, out := &in.Rules, &out.Rules
+		*out = make([]rbac_v1.PolicyRule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.RoleTemplateNames != nil {
+		in, out := &in.RoleTemplateNames, &out.RoleTemplateNames
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.PodSecurityPolicyTemplateNames != nil {
+		in, out := &in.PodSecurityPolicyTemplateNames, &out.PodSecurityPolicyTemplateNames
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RoleTemplate.
+func (in *RoleTemplate) DeepCopy() *RoleTemplate {
+	if in == nil {
+		return nil
+	}
+	out := new(RoleTemplate)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *RoleTemplate) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	} else {
+		return nil
+	}
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RoleTemplateList) DeepCopyInto(out *RoleTemplateList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	out.ListMeta = in.ListMeta
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]RoleTemplate, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RoleTemplateList.
+func (in *RoleTemplateList) DeepCopy() *RoleTemplateList {
+	if in == nil {
+		return nil
+	}
+	out := new(RoleTemplateList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *RoleTemplateList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	} else {
+		return nil
+	}
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *SchedulerService) DeepCopyInto(out *SchedulerService) {
 	*out = *in

apis/management.cattle.io/v3/zz_generated_k8s_client.go

@@ -18,9 +18,8 @@ type Interface interface {
 	MachineDriversGetter
 	MachineTemplatesGetter
 	ProjectsGetter
-	ProjectRoleTemplatesGetter
+	RoleTemplatesGetter
 	PodSecurityPolicyTemplatesGetter
-	ClusterRoleTemplatesGetter
 	ClusterRoleTemplateBindingsGetter
 	ProjectRoleTemplateBindingsGetter
 	ClustersGetter
@@ -38,9 +37,8 @@ type Client struct {
 	machineDriverControllers              map[string]MachineDriverController
 	machineTemplateControllers            map[string]MachineTemplateController
 	projectControllers                    map[string]ProjectController
-	projectRoleTemplateControllers        map[string]ProjectRoleTemplateController
+	roleTemplateControllers               map[string]RoleTemplateController
 	podSecurityPolicyTemplateControllers  map[string]PodSecurityPolicyTemplateController
-	clusterRoleTemplateControllers        map[string]ClusterRoleTemplateController
 	clusterRoleTemplateBindingControllers map[string]ClusterRoleTemplateBindingController
 	projectRoleTemplateBindingControllers map[string]ProjectRoleTemplateBindingController
 	clusterControllers                    map[string]ClusterController
@@ -67,9 +65,8 @@ func NewForConfig(config rest.Config) (Interface, error) {
 		machineDriverControllers:              map[string]MachineDriverController{},
 		machineTemplateControllers:            map[string]MachineTemplateController{},
 		projectControllers:                    map[string]ProjectController{},
-		projectRoleTemplateControllers:        map[string]ProjectRoleTemplateController{},
+		roleTemplateControllers:               map[string]RoleTemplateController{},
 		podSecurityPolicyTemplateControllers:  map[string]PodSecurityPolicyTemplateController{},
-		clusterRoleTemplateControllers:        map[string]ClusterRoleTemplateController{},
 		clusterRoleTemplateBindingControllers: map[string]ClusterRoleTemplateBindingController{},
 		projectRoleTemplateBindingControllers: map[string]ProjectRoleTemplateBindingController{},
 		clusterControllers:                    map[string]ClusterController{},
@@ -143,13 +140,13 @@ func (c *Client) Projects(namespace string) ProjectInterface {
 	}
 }
 
-type ProjectRoleTemplatesGetter interface {
-	ProjectRoleTemplates(namespace string) ProjectRoleTemplateInterface
+type RoleTemplatesGetter interface {
+	RoleTemplates(namespace string) RoleTemplateInterface
 }
 
-func (c *Client) ProjectRoleTemplates(namespace string) ProjectRoleTemplateInterface {
-	objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ProjectRoleTemplateResource, ProjectRoleTemplateGroupVersionKind, projectRoleTemplateFactory{})
-	return &projectRoleTemplateClient{
+func (c *Client) RoleTemplates(namespace string) RoleTemplateInterface {
+	objectClient := clientbase.NewObjectClient(namespace, c.restClient, &RoleTemplateResource, RoleTemplateGroupVersionKind, roleTemplateFactory{})
+	return &roleTemplateClient{
 		ns:           namespace,
 		client:       c,
 		objectClient: objectClient,
@@ -169,19 +166,6 @@ func (c *Client) PodSecurityPolicyTemplates(namespace string) PodSecurityPolicyT
 	}
 }
 
-type ClusterRoleTemplatesGetter interface {
-	ClusterRoleTemplates(namespace string) ClusterRoleTemplateInterface
-}
-
-func (c *Client) ClusterRoleTemplates(namespace string) ClusterRoleTemplateInterface {
-	objectClient := clientbase.NewObjectClient(namespace, c.restClient, &ClusterRoleTemplateResource, ClusterRoleTemplateGroupVersionKind, clusterRoleTemplateFactory{})
-	return &clusterRoleTemplateClient{
-		ns:           namespace,
-		client:       c,
-		objectClient: objectClient,
-	}
-}
-
 type ClusterRoleTemplateBindingsGetter interface {
 	ClusterRoleTemplateBindings(namespace string) ClusterRoleTemplateBindingInterface
 }

apis/management.cattle.io/v3/zz_generated_project_role_template_controller.go

@@ -1,187 +0,0 @@
-package v3
-
-import (
-	"context"
-
-	"github.com/rancher/norman/clientbase"
-	"github.com/rancher/norman/controller"
-	"k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/tools/cache"
-)
-
-var (
-	ProjectRoleTemplateGroupVersionKind = schema.GroupVersionKind{
-		Version: "v3",
-		Group:   "management.cattle.io",
-		Kind:    "ProjectRoleTemplate",
-	}
-	ProjectRoleTemplateResource = metav1.APIResource{
-		Name:         "projectroletemplates",
-		SingularName: "projectroletemplate",
-		Namespaced:   false,
-		Kind:         ProjectRoleTemplateGroupVersionKind.Kind,
-	}
-)
-
-type ProjectRoleTemplateList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ProjectRoleTemplate
-}
-
-type ProjectRoleTemplateHandlerFunc func(key string, obj *ProjectRoleTemplate) error
-
-type ProjectRoleTemplateLister interface {
-	List(namespace string, selector labels.Selector) (ret []*ProjectRoleTemplate, err error)
-	Get(namespace, name string) (*ProjectRoleTemplate, error)
-}
-
-type ProjectRoleTemplateController interface {
-	Informer() cache.SharedIndexInformer
-	Lister() ProjectRoleTemplateLister
-	AddHandler(handler ProjectRoleTemplateHandlerFunc)
-	Enqueue(namespace, name string)
-	Sync(ctx context.Context) error
-	Start(ctx context.Context, threadiness int) error
-}
-
-type ProjectRoleTemplateInterface interface {
-	ObjectClient() *clientbase.ObjectClient
-	Create(*ProjectRoleTemplate) (*ProjectRoleTemplate, error)
-	Get(name string, opts metav1.GetOptions) (*ProjectRoleTemplate, error)
-	Update(*ProjectRoleTemplate) (*ProjectRoleTemplate, error)
-	Delete(name string, options *metav1.DeleteOptions) error
-	List(opts metav1.ListOptions) (*ProjectRoleTemplateList, error)
-	Watch(opts metav1.ListOptions) (watch.Interface, error)
-	DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error
-	Controller() ProjectRoleTemplateController
-}
-
-type projectRoleTemplateLister struct {
-	controller *projectRoleTemplateController
-}
-
-func (l *projectRoleTemplateLister) List(namespace string, selector labels.Selector) (ret []*ProjectRoleTemplate, err error) {
-	err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) {
-		ret = append(ret, obj.(*ProjectRoleTemplate))
-	})
-	return
-}
-
-func (l *projectRoleTemplateLister) Get(namespace, name string) (*ProjectRoleTemplate, error) {
-	obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name)
-	if err != nil {
-		return nil, err
-	}
-	if !exists {
-		return nil, errors.NewNotFound(schema.GroupResource{
-			Group:    ProjectRoleTemplateGroupVersionKind.Group,
-			Resource: "projectRoleTemplate",
-		}, name)
-	}
-	return obj.(*ProjectRoleTemplate), nil
-}
-
-type projectRoleTemplateController struct {
-	controller.GenericController
-}
-
-func (c *projectRoleTemplateController) Lister() ProjectRoleTemplateLister {
-	return &projectRoleTemplateLister{
-		controller: c,
-	}
-}
-
-func (c *projectRoleTemplateController) AddHandler(handler ProjectRoleTemplateHandlerFunc) {
-	c.GenericController.AddHandler(func(key string) error {
-		obj, exists, err := c.Informer().GetStore().GetByKey(key)
-		if err != nil {
-			return err
-		}
-		if !exists {
-			return handler(key, nil)
-		}
-		return handler(key, obj.(*ProjectRoleTemplate))
-	})
-}
-
-type projectRoleTemplateFactory struct {
-}
-
-func (c projectRoleTemplateFactory) Object() runtime.Object {
-	return &ProjectRoleTemplate{}
-}
-
-func (c projectRoleTemplateFactory) List() runtime.Object {
-	return &ProjectRoleTemplateList{}
-}
-
-func (s *projectRoleTemplateClient) Controller() ProjectRoleTemplateController {
-	s.client.Lock()
-	defer s.client.Unlock()
-
-	c, ok := s.client.projectRoleTemplateControllers[s.ns]
-	if ok {
-		return c
-	}
-
-	genericController := controller.NewGenericController(ProjectRoleTemplateGroupVersionKind.Kind+"Controller",
-		s.objectClient)
-
-	c = &projectRoleTemplateController{
-		GenericController: genericController,
-	}
-
-	s.client.projectRoleTemplateControllers[s.ns] = c
-	s.client.starters = append(s.client.starters, c)
-
-	return c
-}
-
-type projectRoleTemplateClient struct {
-	client       *Client
-	ns           string
-	objectClient *clientbase.ObjectClient
-	controller   ProjectRoleTemplateController
-}
-
-func (s *projectRoleTemplateClient) ObjectClient() *clientbase.ObjectClient {
-	return s.objectClient
-}
-
-func (s *projectRoleTemplateClient) Create(o *ProjectRoleTemplate) (*ProjectRoleTemplate, error) {
-	obj, err := s.objectClient.Create(o)
-	return obj.(*ProjectRoleTemplate), err
-}
-
-func (s *projectRoleTemplateClient) Get(name string, opts metav1.GetOptions) (*ProjectRoleTemplate, error) {
-	obj, err := s.objectClient.Get(name, opts)
-	return obj.(*ProjectRoleTemplate), err
-}
-
-func (s *projectRoleTemplateClient) Update(o *ProjectRoleTemplate) (*ProjectRoleTemplate, error) {
-	obj, err := s.objectClient.Update(o.Name, o)
-	return obj.(*ProjectRoleTemplate), err
-}
-
-func (s *projectRoleTemplateClient) Delete(name string, options *metav1.DeleteOptions) error {
-	return s.objectClient.Delete(name, options)
-}
-
-func (s *projectRoleTemplateClient) List(opts metav1.ListOptions) (*ProjectRoleTemplateList, error) {
-	obj, err := s.objectClient.List(opts)
-	return obj.(*ProjectRoleTemplateList), err
-}
-
-func (s *projectRoleTemplateClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
-	return s.objectClient.Watch(opts)
-}
-
-func (s *projectRoleTemplateClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error {
-	return s.objectClient.DeleteCollection(deleteOpts, listOpts)
-}

apis/management.cattle.io/v3/zz_generated_project_role_template_lifecycle_adapter.go

@@ -1,39 +0,0 @@
-package v3
-
-import (
-	"github.com/rancher/norman/lifecycle"
-	"k8s.io/apimachinery/pkg/runtime"
-)
-
-type ProjectRoleTemplateLifecycle interface {
-	Create(obj *ProjectRoleTemplate) error
-	Remove(obj *ProjectRoleTemplate) error
-	Updated(obj *ProjectRoleTemplate) error
-}
-
-type projectRoleTemplateLifecycleAdapter struct {
-	lifecycle ProjectRoleTemplateLifecycle
-}
-
-func (w *projectRoleTemplateLifecycleAdapter) Create(obj runtime.Object) error {
-	return w.lifecycle.Create(obj.(*ProjectRoleTemplate))
-}
-
-func (w *projectRoleTemplateLifecycleAdapter) Finalize(obj runtime.Object) error {
-	return w.lifecycle.Remove(obj.(*ProjectRoleTemplate))
-}
-
-func (w *projectRoleTemplateLifecycleAdapter) Updated(obj runtime.Object) error {
-	return w.lifecycle.Updated(obj.(*ProjectRoleTemplate))
-}
-
-func NewProjectRoleTemplateLifecycleAdapter(name string, client ProjectRoleTemplateInterface, l ProjectRoleTemplateLifecycle) ProjectRoleTemplateHandlerFunc {
-	adapter := &projectRoleTemplateLifecycleAdapter{lifecycle: l}
-	syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient())
-	return func(key string, obj *ProjectRoleTemplate) error {
-		if obj == nil {
-			return syncFn(key, nil)
-		}
-		return syncFn(key, obj)
-	}
-}

apis/management.cattle.io/v3/zz_generated_role_template_controller.go

@@ -0,0 +1,187 @@
+package v3
+
+import (
+	"context"
+
+	"github.com/rancher/norman/clientbase"
+	"github.com/rancher/norman/controller"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/tools/cache"
+)
+
+var (
+	RoleTemplateGroupVersionKind = schema.GroupVersionKind{
+		Version: "v3",
+		Group:   "management.cattle.io",
+		Kind:    "RoleTemplate",
+	}
+	RoleTemplateResource = metav1.APIResource{
+		Name:         "roletemplates",
+		SingularName: "roletemplate",
+		Namespaced:   false,
+		Kind:         RoleTemplateGroupVersionKind.Kind,
+	}
+)
+
+type RoleTemplateList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []RoleTemplate
+}
+
+type RoleTemplateHandlerFunc func(key string, obj *RoleTemplate) error
+
+type RoleTemplateLister interface {
+	List(namespace string, selector labels.Selector) (ret []*RoleTemplate, err error)
+	Get(namespace, name string) (*RoleTemplate, error)
+}
+
+type RoleTemplateController interface {
+	Informer() cache.SharedIndexInformer
+	Lister() RoleTemplateLister
+	AddHandler(handler RoleTemplateHandlerFunc)
+	Enqueue(namespace, name string)
+	Sync(ctx context.Context) error
+	Start(ctx context.Context, threadiness int) error
+}
+
+type RoleTemplateInterface interface {
+	ObjectClient() *clientbase.ObjectClient
+	Create(*RoleTemplate) (*RoleTemplate, error)
+	Get(name string, opts metav1.GetOptions) (*RoleTemplate, error)
+	Update(*RoleTemplate) (*RoleTemplate, error)
+	Delete(name string, options *metav1.DeleteOptions) error
+	List(opts metav1.ListOptions) (*RoleTemplateList, error)
+	Watch(opts metav1.ListOptions) (watch.Interface, error)
+	DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error
+	Controller() RoleTemplateController
+}
+
+type roleTemplateLister struct {
+	controller *roleTemplateController
+}
+
+func (l *roleTemplateLister) List(namespace string, selector labels.Selector) (ret []*RoleTemplate, err error) {
+	err = cache.ListAllByNamespace(l.controller.Informer().GetIndexer(), namespace, selector, func(obj interface{}) {
+		ret = append(ret, obj.(*RoleTemplate))
+	})
+	return
+}
+
+func (l *roleTemplateLister) Get(namespace, name string) (*RoleTemplate, error) {
+	obj, exists, err := l.controller.Informer().GetIndexer().GetByKey(namespace + "/" + name)
+	if err != nil {
+		return nil, err
+	}
+	if !exists {
+		return nil, errors.NewNotFound(schema.GroupResource{
+			Group:    RoleTemplateGroupVersionKind.Group,
+			Resource: "roleTemplate",
+		}, name)
+	}
+	return obj.(*RoleTemplate), nil
+}
+
+type roleTemplateController struct {
+	controller.GenericController
+}
+
+func (c *roleTemplateController) Lister() RoleTemplateLister {
+	return &roleTemplateLister{
+		controller: c,
+	}
+}
+
+func (c *roleTemplateController) AddHandler(handler RoleTemplateHandlerFunc) {
+	c.GenericController.AddHandler(func(key string) error {
+		obj, exists, err := c.Informer().GetStore().GetByKey(key)
+		if err != nil {
+			return err
+		}
+		if !exists {
+			return handler(key, nil)
+		}
+		return handler(key, obj.(*RoleTemplate))
+	})
+}
+
+type roleTemplateFactory struct {
+}
+
+func (c roleTemplateFactory) Object() runtime.Object {
+	return &RoleTemplate{}
+}
+
+func (c roleTemplateFactory) List() runtime.Object {
+	return &RoleTemplateList{}
+}
+
+func (s *roleTemplateClient) Controller() RoleTemplateController {
+	s.client.Lock()
+	defer s.client.Unlock()
+
+	c, ok := s.client.roleTemplateControllers[s.ns]
+	if ok {
+		return c
+	}
+
+	genericController := controller.NewGenericController(RoleTemplateGroupVersionKind.Kind+"Controller",
+		s.objectClient)
+
+	c = &roleTemplateController{
+		GenericController: genericController,
+	}
+
+	s.client.roleTemplateControllers[s.ns] = c
+	s.client.starters = append(s.client.starters, c)
+
+	return c
+}
+
+type roleTemplateClient struct {
+	client       *Client
+	ns           string
+	objectClient *clientbase.ObjectClient
+	controller   RoleTemplateController
+}
+
+func (s *roleTemplateClient) ObjectClient() *clientbase.ObjectClient {
+	return s.objectClient
+}
+
+func (s *roleTemplateClient) Create(o *RoleTemplate) (*RoleTemplate, error) {
+	obj, err := s.objectClient.Create(o)
+	return obj.(*RoleTemplate), err
+}
+
+func (s *roleTemplateClient) Get(name string, opts metav1.GetOptions) (*RoleTemplate, error) {
+	obj, err := s.objectClient.Get(name, opts)
+	return obj.(*RoleTemplate), err
+}
+
+func (s *roleTemplateClient) Update(o *RoleTemplate) (*RoleTemplate, error) {
+	obj, err := s.objectClient.Update(o.Name, o)
+	return obj.(*RoleTemplate), err
+}
+
+func (s *roleTemplateClient) Delete(name string, options *metav1.DeleteOptions) error {
+	return s.objectClient.Delete(name, options)
+}
+
+func (s *roleTemplateClient) List(opts metav1.ListOptions) (*RoleTemplateList, error) {
+	obj, err := s.objectClient.List(opts)
+	return obj.(*RoleTemplateList), err
+}
+
+func (s *roleTemplateClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
+	return s.objectClient.Watch(opts)
+}
+
+func (s *roleTemplateClient) DeleteCollection(deleteOpts *metav1.DeleteOptions, listOpts metav1.ListOptions) error {
+	return s.objectClient.DeleteCollection(deleteOpts, listOpts)
+}

apis/management.cattle.io/v3/zz_generated_role_template_lifecycle_adapter.go

@@ -0,0 +1,39 @@
+package v3
+
+import (
+	"github.com/rancher/norman/lifecycle"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+type RoleTemplateLifecycle interface {
+	Create(obj *RoleTemplate) error
+	Remove(obj *RoleTemplate) error
+	Updated(obj *RoleTemplate) error
+}
+
+type roleTemplateLifecycleAdapter struct {
+	lifecycle RoleTemplateLifecycle
+}
+
+func (w *roleTemplateLifecycleAdapter) Create(obj runtime.Object) error {
+	return w.lifecycle.Create(obj.(*RoleTemplate))
+}
+
+func (w *roleTemplateLifecycleAdapter) Finalize(obj runtime.Object) error {
+	return w.lifecycle.Remove(obj.(*RoleTemplate))
+}
+
+func (w *roleTemplateLifecycleAdapter) Updated(obj runtime.Object) error {
+	return w.lifecycle.Updated(obj.(*RoleTemplate))
+}
+
+func NewRoleTemplateLifecycleAdapter(name string, client RoleTemplateInterface, l RoleTemplateLifecycle) RoleTemplateHandlerFunc {
+	adapter := &roleTemplateLifecycleAdapter{lifecycle: l}
+	syncFn := lifecycle.NewObjectLifecycleAdapter(name, adapter, client.ObjectClient())
+	return func(key string, obj *RoleTemplate) error {
+		if obj == nil {
+			return syncFn(key, nil)
+		}
+		return syncFn(key, obj)
+	}
+}