From d0d4c193f6470f8b2fc19fd5b809a58c5c4cb5b4 Mon Sep 17 00:00:00 2001 From: carolyn Date: Tue, 4 Sep 2018 15:49:59 -0700 Subject: [PATCH] enforce HostnamePrefix to be dnsLabel and relax RequestedHostname to be hostname --- apis/management.cattle.io/v3/machine_types.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/management.cattle.io/v3/machine_types.go b/apis/management.cattle.io/v3/machine_types.go index 5ea2e66a..3c2d626c 100644 --- a/apis/management.cattle.io/v3/machine_types.go +++ b/apis/management.cattle.io/v3/machine_types.go @@ -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"`