From 2a197d24901cac52df18da1ca42e80bfc56a7002 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Wed, 17 Jan 2018 15:43:43 -0700 Subject: [PATCH] Make role an enum --- apis/management.cattle.io/v3/machine_types.go | 2 +- apis/management.cattle.io/v3/rke_types.go | 2 +- 2 files 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 84b1d80c..125dfa24 100644 --- a/apis/management.cattle.io/v3/machine_types.go +++ b/apis/management.cattle.io/v3/machine_types.go @@ -108,7 +108,7 @@ type MachineSpec struct { DisplayName string `json:"displayName,omitempty"` RequestedHostname string `json:"requestedHostname,omitempty" norman:"noupdate"` ClusterName string `json:"clusterName,omitempty" norman:"type=reference[cluster],noupdate,required"` - Role []string `json:"role,omitempty" norman:"noupdate"` + Role []string `json:"role,omitempty" norman:"noupdate,type=array[enum],options=etcd|worker|controlplane"` MachineTemplateName string `json:"machineTemplateName,omitempty" norman:"type=reference[machineTemplate],noupdate"` } diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 5b8ae05e..5667c4ae 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -29,7 +29,7 @@ type RKEConfigNode struct { // Optional - Internal address that will be used for components communication InternalAddress string `yaml:"internal_address" json:"internalAddress,omitempty"` // Node role in kubernetes cluster (controlplane, worker, or etcd) - Role []string `yaml:"role" json:"role,omitempty"` + Role []string `yaml:"role" json:"role,omitempty" norman:"type=array[enum],options=etcd|worker|controlplane"` // Optional - Hostname of the node HostnameOverride string `yaml:"hostname_override" json:"hostnameOverride,omitempty"` // SSH usesr that will be used by RKE