From 1123611749ec2cd4d922dd32eae30d5dec55e7e2 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 28 Dec 2017 09:47:19 -0700 Subject: [PATCH] Machine/RKE updates --- apis/management.cattle.io/v3/machine_types.go | 1 - apis/management.cattle.io/v3/rke_types.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apis/management.cattle.io/v3/machine_types.go b/apis/management.cattle.io/v3/machine_types.go index 5568e578..6d263ce1 100644 --- a/apis/management.cattle.io/v3/machine_types.go +++ b/apis/management.cattle.io/v3/machine_types.go @@ -92,7 +92,6 @@ type MachineCondition struct { type MachineSpec struct { NodeSpec v1.NodeSpec `json:"nodeSpec"` - DisplayName string `json:"displayName"` ClusterName string `json:"clusterName" norman:"type=reference[cluster]"` Roles []string `json:"roles"` MachineTemplateName string `json:"machineTemplateName" norman:"type=reference[machineTemplate]"` diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 180bcf30..409f3e9a 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -23,7 +23,7 @@ type RancherKubernetesEngineConfig struct { type RKEConfigNode struct { // Name of the host provisioned via docker machine - MachineName string `yaml:"machine_name,omitempty" json:"machineName,omitempty"` + MachineName string `yaml:"machine_name,omitempty" json:"machineName,omitempty" norman:"type=reference[machine]"` // IP or FQDN that is fully resolvable and used for SSH communication Address string `yaml:"address" json:"address,omitempty"` // Optional - Internal address that will be used for components communication