From 75ca577d52cd20e0520992441d06c6b313216a52 Mon Sep 17 00:00:00 2001 From: Craig Jellick Date: Fri, 19 Jan 2018 16:03:32 -0700 Subject: [PATCH] Make roletemplate.context optional --- apis/management.cattle.io/v3/authz_types.go | 2 +- apis/management.cattle.io/v3/schema/schema.go | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/apis/management.cattle.io/v3/authz_types.go b/apis/management.cattle.io/v3/authz_types.go index e7100104..216ee042 100644 --- a/apis/management.cattle.io/v3/authz_types.go +++ b/apis/management.cattle.io/v3/authz_types.go @@ -77,7 +77,7 @@ type RoleTemplate struct { Builtin bool `json:"builtin" norman:"nocreate,noupdate"` External bool `json:"external"` Hidden bool `json:"hidden"` - Context string `json:"context"` + Context string `json:"context" norman:"type=string,options=project|cluster"` RoleTemplateNames []string `json:"roleTemplateNames,omitempty" norman:"type=array[reference[roleTemplate]]"` } diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index 8246ed86..6221ec80 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -99,14 +99,7 @@ func authzTypes(schemas *types.Schemas) *types.Schemas { }). MustImport(&Version, v3.GlobalRole{}). MustImport(&Version, v3.GlobalRoleBinding{}). - MustImportAndCustomize(&Version, v3.RoleTemplate{}, func(schema *types.Schema) { - schema.MustCustomizeField("context", func(field types.Field) types.Field { - field.Type = "enum" - field.Options = []string{"cluster", "project"} - field.Nullable = false - return field - }) - }). + MustImport(&Version, v3.RoleTemplate{}). MustImport(&Version, v3.PodSecurityPolicyTemplate{}). MustImportAndCustomize(&Version, v3.ClusterRoleTemplateBinding{}, func(schema *types.Schema) { schema.MustCustomizeField("subjectKind", func(field types.Field) types.Field {