diff --git a/apis/management.cattle.io/v3/authz_types.go b/apis/management.cattle.io/v3/authz_types.go index 9a489a75..04ec3861 100644 --- a/apis/management.cattle.io/v3/authz_types.go +++ b/apis/management.cattle.io/v3/authz_types.go @@ -23,8 +23,9 @@ type GlobalRole struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - Rules []rbacv1.PolicyRule `json:"rules,omitempty"` - Builtin bool `json:"builtin"` + DisplayName string `json:"displayName,omitempty" norman:"required"` + Rules []rbacv1.PolicyRule `json:"rules,omitempty"` + Builtin bool `json:"builtin"` } type GlobalRoleBinding struct { @@ -39,6 +40,7 @@ type RoleTemplate struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` + DisplayName string `json:"displayName,omitempty" norman:"required"` Rules []rbacv1.PolicyRule `json:"rules,omitempty"` Builtin bool `json:"builtin"` External bool `json:"external"` diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index d494ee91..1abb7310 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -87,9 +87,9 @@ func clusterTypes(schemas *types.Schemas) *types.Schemas { func authzTypes(schemas *types.Schemas) *types.Schemas { return schemas. - AddMapperForType(&Version, v3.Project{}, - m.DisplayName{}, - ). + AddMapperForType(&Version, v3.Project{}, m.DisplayName{}). + AddMapperForType(&Version, v3.GlobalRole{}, m.DisplayName{}). + AddMapperForType(&Version, v3.RoleTemplate{}, m.DisplayName{}). AddMapperForType(&Version, v3.ProjectRoleTemplateBinding{}, &m.Move{From: "subject/name", To: "subjectName"}, &m.Move{From: "subject/kind", To: "subjectKind"},