rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-16 14:59:16 +00:00
Code Issues Releases Wiki Activity

Remove SliceToMap mapper for ingress rule

Browse Source
This commit is contained in:
orangedeng
2019-01-22 16:10:19 +08:00
committed by Craig Jellick
parent 1e6b3e4c5f
commit ac05260398
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apis/project.cattle.io/v3/schema/schema.go
View File

@@ -669,9 +669,6 @@ func addServiceOrDNSRecord(dns bool) types.SchemasInitFunc {
func ingressTypes(schemas *types.Schemas) *types.Schemas {
return schemas.
AddMapperForType(&Version, v1beta1.HTTPIngressRuleValue{},
&m.SliceToMap{Field: "paths", Key: "path"},
).
AddMapperForType(&Version, v1beta1.HTTPIngressPath{},
&m.Embed{Field: "backend"},
).
@@ -693,12 +690,7 @@ func ingressTypes(schemas *types.Schemas) *types.Schemas {
WorkloadIDs string `json:"workloadIds" norman:"type=array[reference[workload]]"`
ServiceName string `norman:"type=reference[service]"`
}{}).
MustImportAndCustomize(&Version, v1beta1.IngressRule{}, func(schema *types.Schema) {
schema.MustCustomizeField("paths", func(f types.Field) types.Field {
f.Type = "map[ingressBackend]"
return f
})
}).
MustImport(&Version, v1beta1.IngressRule{}).
MustImport(&Version, v1beta1.IngressTLS{}, struct {
SecretName string `norman:"type=reference[certificate]"`
}{}).