From 1623cca1ee04c731b692d11d6f6648a045211010 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Wed, 14 Feb 2018 22:27:27 -0700 Subject: [PATCH] Fix nodeName for yaml too --- apis/management.cattle.io/v3/machine_types.go | 2 ++ apis/management.cattle.io/v3/rke_types.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apis/management.cattle.io/v3/machine_types.go b/apis/management.cattle.io/v3/machine_types.go index 82c85d62..7271cd0f 100644 --- a/apis/management.cattle.io/v3/machine_types.go +++ b/apis/management.cattle.io/v3/machine_types.go @@ -8,6 +8,8 @@ import ( ) type NodeTemplate struct { + types.Namespaced + metav1.TypeMeta `json:",inline"` // Standard object’s metadata. More info: // https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 376c4937..10d39e33 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -85,7 +85,7 @@ type RKESystemImages struct { type RKEConfigNode struct { // Name of the host provisioned via docker machine - NodeName string `yaml:"-" json:"nodeName,omitempty" norman:"type=reference[node]"` + NodeName string `yaml:"nodeName,omitempty" json:"nodeName,omitempty" norman:"type=reference[node]"` // 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