rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-25 04:12:02 +00:00
Code Issues Releases Wiki Activity

enforce HostnamePrefix to be dnsLabel and relax RequestedHostname to be hostname

Browse Source
This commit is contained in:
carolyn
2018-09-04 15:49:59 -07:00
committed by Alena Prokharchyk
parent 2f7c66d509
commit d0d4c193f6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,7 @@ type NodePoolSpec struct {
Worker bool `json:"worker"`
NodeTemplateName string `json:"nodeTemplateName,omitempty" norman:"type=reference[nodeTemplate],required,notnullable"`
HostnamePrefix string `json:"hostnamePrefix" norman:"required,notnullable"`
HostnamePrefix string `json:"hostnamePrefix" norman:"type=dnsLabel,required,notnullable"`
Quantity int `json:"quantity" norman:"required,default=1"`
NodeLabels map[string]string `json:"nodeLabels"`
NodeAnnotations map[string]string `json:"nodeAnnotations"`
@@ -184,7 +184,7 @@ type NodeSpec struct {
Imported bool `json:"imported"`
Description string `json:"description,omitempty"`
DisplayName string `json:"displayName"`
RequestedHostname string `json:"requestedHostname,omitempty" norman:"type=dnsLabel,nullable,noupdate,required"`
RequestedHostname string `json:"requestedHostname,omitempty" norman:"type=hostname,nullable,noupdate,required"`
InternalNodeSpec v1.NodeSpec `json:"internalNodeSpec"`
DesiredNodeLabels map[string]string `json:"desiredNodeLabels,omitempty"`
DesiredNodeAnnotations map[string]string `json:"desiredNodeAnnotations,omitempty"`