rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-07-05 17:56:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1018 from rmweir/cd-global-roles

Browse Source 
Add builtin field to global roles
This commit is contained in:
Dan Ramich 2019-11-14 12:11:18 -08:00 committed by GitHub
commit 5469d35f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apis/management.cattle.io/v3/authz_types.go
View File

@ -63,10 +63,11 @@ type GlobalRole struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
DisplayName string `json:"displayName,omitempty" norman:"required,noupdate"`
Description string `json:"description" norman:"noupdate"`
Rules []rbacv1.PolicyRule `json:"rules,omitempty" norman:"noupdate"`
DisplayName string `json:"displayName,omitempty" norman:"required"`
Description string `json:"description"`
Rules []rbacv1.PolicyRule `json:"rules,omitempty"`
NewUserDefault bool `json:"newUserDefault,omitempty" norman:"required"`
Builtin bool `json:"builtin" norman:"nocreate,noupdate"`
}
type GlobalRoleBinding struct {

5
apis/management.cattle.io/v3/schema/schema.go
View File

@ -308,10 +308,7 @@ func authzTypes(schemas *types.Schemas) *types.Schemas {
},
}
}).
MustImportAndCustomize(&Version, v3.GlobalRole{}, func(schema *types.Schema) {
schema.CollectionMethods = []string{http.MethodGet}
schema.ResourceMethods = []string{http.MethodGet, http.MethodPut}
}).
MustImport(&Version, v3.GlobalRole{}).
MustImport(&Version, v3.GlobalRoleBinding{}).
MustImport(&Version, v3.RoleTemplate{}).
MustImport(&Version, v3.PodSecurityPolicyTemplate{}).

2
client/management/v3/zz_generated_global_role.go
View File

@ -7,6 +7,7 @@ import (
const (
GlobalRoleType = "globalRole"
GlobalRoleFieldAnnotations = "annotations"
GlobalRoleFieldBuiltin = "builtin"
GlobalRoleFieldCreated = "created"
GlobalRoleFieldCreatorID = "creatorId"
GlobalRoleFieldDescription = "description"
@ -22,6 +23,7 @@ const (
type GlobalRole struct {
types.Resource
Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
Builtin bool `json:"builtin,omitempty" yaml:"builtin,omitempty"`
Created string `json:"created,omitempty" yaml:"created,omitempty"`
CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"`
Description string `json:"description,omitempty" yaml:"description,omitempty"`

1
compose/zz_generated_compose.go
View File

@ -15,6 +15,7 @@ type Config struct {
NodeDrivers map[string]managementClient.NodeDriver `json:"nodeDrivers,omitempty" yaml:"nodeDrivers,omitempty"`
NodeTemplates map[string]managementClient.NodeTemplate `json:"nodeTemplates,omitempty" yaml:"nodeTemplates,omitempty"`
Projects map[string]managementClient.Project `json:"projects,omitempty" yaml:"projects,omitempty"`
GlobalRoles map[string]managementClient.GlobalRole `json:"globalRoles,omitempty" yaml:"globalRoles,omitempty"`
GlobalRoleBindings map[string]managementClient.GlobalRoleBinding `json:"globalRoleBindings,omitempty" yaml:"globalRoleBindings,omitempty"`
RoleTemplates map[string]managementClient.RoleTemplate `json:"roleTemplates,omitempty" yaml:"roleTemplates,omitempty"`
PodSecurityPolicyTemplates map[string]managementClient.PodSecurityPolicyTemplate `json:"podSecurityPolicyTemplates,omitempty" yaml:"podSecurityPolicyTemplates,omitempty"`