From 8290d7ad3236eb28cbfe9c3c2528f046265bfb9b Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 17 Oct 2019 03:29:13 +0200 Subject: [PATCH] Override encryption types in schema --- apis/management.cattle.io/v3/schema/schema.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index 6b1eef08..062c70eb 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -9,6 +9,7 @@ import ( "github.com/rancher/types/factory" "github.com/rancher/types/mapper" v1 "k8s.io/api/core/v1" + apiserverconfig "k8s.io/apiserver/pkg/apis/config" ) var ( @@ -45,7 +46,8 @@ var ( Init(credTypes). Init(mgmtSecretTypes). Init(clusterTemplateTypes). - Init(driverMetadataTypes) + Init(driverMetadataTypes). + Init(encryptionTypes) TokenSchemas = factory.Schemas(&Version). Init(tokens) @@ -905,3 +907,12 @@ func clusterScanTypes(schemas *types.Schemas) *types.Schemas { schema.ResourceMethods = []string{http.MethodGet, http.MethodDelete} }) } + +func encryptionTypes(schemas *types.Schemas) *types.Schemas { + return schemas.MustImport(&Version, v3.SecretsEncryptionConfig{}). + MustImport(&Version, apiserverconfig.Key{}, struct { + Secret string `norman:"type=password"` + }{}).MustImport(&Version, apiserverconfig.KMSConfiguration{}, struct { + Timeout string + }{}) +}