diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index e61a4920..64b6407a 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -240,14 +240,12 @@ type GenerateKubeConfigOutput struct { } type ImportClusterYamlInput struct { - Yaml string `json:"yaml,omitempty"` -} - -type ImportProjectYamlInput struct { - Yaml string `json:"yaml,omitempty"` - Namespace string `json:"namespace,omitempty"` + YAML string `json:"yaml,omitempty"` + DefaultNamespace string `json:"defaultNamespace,omitempty"` + Namespace string `json:"namespace,omitempty"` + ProjectName string `json:"projectName,omitempty" norman:"type=reference[project]"` } type ImportYamlOutput struct { - OutputMessage string `json:"outputMessage,omitempty"` + Message string `json:"message,omitempty"` } diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index ab846f42..3c809352 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -172,7 +172,6 @@ func authzTypes(schemas *types.Schemas) *types.Schemas { &mapper.NamespaceIDMapper{}, ). MustImport(&Version, v3.SetPodSecurityPolicyTemplateInput{}). - MustImport(&Version, v3.ImportProjectYamlInput{}). MustImport(&Version, v3.ImportYamlOutput{}). MustImportAndCustomize(&Version, v3.Project{}, func(schema *types.Schema) { schema.ResourceActions = map[string]types.Action{ @@ -180,10 +179,6 @@ func authzTypes(schemas *types.Schemas) *types.Schemas { Input: "setPodSecurityPolicyTemplateInput", Output: "project", }, - "importYaml": { - Input: "importProjectYamlInput", - Output: "importYamlOutput", - }, } }). MustImport(&Version, v3.GlobalRole{}).