From 8e8927b3cf91e8c5bf3062afd66361f39019382a Mon Sep 17 00:00:00 2001 From: Craig Jellick Date: Wed, 17 Jan 2018 19:37:15 -0700 Subject: [PATCH 1/2] Add context to roleTemplate --- apis/management.cattle.io/v3/authz_types.go | 1 + apis/management.cattle.io/v3/schema/schema.go | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apis/management.cattle.io/v3/authz_types.go b/apis/management.cattle.io/v3/authz_types.go index 4999572e..58914dcd 100644 --- a/apis/management.cattle.io/v3/authz_types.go +++ b/apis/management.cattle.io/v3/authz_types.go @@ -77,6 +77,7 @@ type RoleTemplate struct { Builtin bool `json:"builtin"` External bool `json:"external"` Hidden bool `json:"hidden"` + Context string `json:"context"` 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 7a4199c4..cb69c4ba 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -96,7 +96,14 @@ func authzTypes(schemas *types.Schemas) *types.Schemas { }). MustImport(&Version, v3.GlobalRole{}). MustImport(&Version, v3.GlobalRoleBinding{}). - MustImport(&Version, v3.RoleTemplate{}). + 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.PodSecurityPolicyTemplate{}). MustImportAndCustomize(&Version, v3.ClusterRoleTemplateBinding{}, func(schema *types.Schema) { schema.MustCustomizeField("subjectKind", func(field types.Field) types.Field { From 6c26c2cd7f94618c2f076c6c0160c396dcca5148 Mon Sep 17 00:00:00 2001 From: Craig Jellick Date: Wed, 17 Jan 2018 20:14:33 -0700 Subject: [PATCH 2/2] Generated code --- client/management/v3/zz_generated_role_template.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/management/v3/zz_generated_role_template.go b/client/management/v3/zz_generated_role_template.go index 1228cbff..628ddd9a 100644 --- a/client/management/v3/zz_generated_role_template.go +++ b/client/management/v3/zz_generated_role_template.go @@ -8,6 +8,7 @@ const ( RoleTemplateType = "roleTemplate" RoleTemplateFieldAnnotations = "annotations" RoleTemplateFieldBuiltin = "builtin" + RoleTemplateFieldContext = "context" RoleTemplateFieldCreated = "created" RoleTemplateFieldCreatorID = "creatorId" RoleTemplateFieldDescription = "description" @@ -26,6 +27,7 @@ type RoleTemplate struct { types.Resource Annotations map[string]string `json:"annotations,omitempty"` Builtin *bool `json:"builtin,omitempty"` + Context string `json:"context,omitempty"` Created string `json:"created,omitempty"` CreatorID string `json:"creatorId,omitempty"` Description string `json:"description,omitempty"`