rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-02 05:11:59 +00:00
Code Issues Releases Wiki Activity

Use 'dnsLabel' for Cluster name and machine requestedHostname

Browse Source
This commit is contained in:
moelsayed 2018-01-23 21:16:14 +02:00
parent 585d041598
commit 3afcf51cc0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/management.cattle.io/v3/machine_types.go
View File

@ -121,7 +121,7 @@ type MachineSpec struct {
CustomConfig *CustomConfig `json:"customConfig"`
Description string `json:"description,omitempty"`
DisplayName string `json:"displayName"`
RequestedHostname string `json:"requestedHostname,omitempty" norman:"noupdate"`
RequestedHostname string `json:"requestedHostname,omitempty" norman:"type=dnsLabel,nullable,noupdate"`
ClusterName string `json:"clusterName,omitempty" norman:"type=reference[cluster],noupdate,required"`
Role []string `json:"role,omitempty" norman:"noupdate,type=array[enum],options=etcd|worker|controlplane"`
MachineTemplateName string `json:"machineTemplateName,omitempty" norman:"type=reference[machineTemplate],noupdate"`

11
apis/management.cattle.io/v3/schema/schema.go
View File

@ -67,7 +67,15 @@ func clusterTypes(schemas *types.Schemas) *types.Schemas {
schema.SubContext = "clusters"
}).
MustImport(&Version, v3.ClusterEvent{}).
MustImport(&Version, v3.ClusterRegistrationToken{})
MustImport(&Version, v3.ClusterRegistrationToken{}).
MustImportAndCustomize(&Version, v3.Cluster{}, func(schema *types.Schema) {
schema.MustCustomizeField("name", func(field types.Field) types.Field {
field.Type = "dnsLabel"
field.Nullable = true
field.Required = false
return field
})
})
}
func authzTypes(schemas *types.Schemas) *types.Schemas {
@ -185,6 +193,7 @@ func machineTypes(schemas *types.Schemas) *types.Schemas {
}
}).
MustImport(&Version, v3.MachineTemplate{})
}
func authnTypes(schemas *types.Schemas) *types.Schemas {