Merge pull request #69 from alena1108/dec14

NodeConfig to machine spec

apis/management.cattle.io/v3/machine_types.go

@@ -69,6 +69,7 @@ type MachineStatus struct {
 	SSHPrivateKey   string             `json:"sshPrivateKey,omitempty"`
 	ExtractedConfig string             `json:"extractedConfig,omitempty"`
 	Address         string             `json:"address,omitempty"`
+	NodeConfig      *RKEConfigNode     `json:"nodeConfig,omitempty"`
 }
 
 type MachineCondition struct {

apis/management.cattle.io/v3/zz_generated_deepcopy.go

@@ -1548,6 +1548,15 @@ func (in *MachineStatus) DeepCopyInto(out *MachineStatus) {
 			(*out)[key] = val.DeepCopy()
 		}
 	}
+	if in.NodeConfig != nil {
+		in, out := &in.NodeConfig, &out.NodeConfig
+		if *in == nil {
+			*out = nil
+		} else {
+			*out = new(RKEConfigNode)
+			(*in).DeepCopyInto(*out)
+		}
+	}
 	return
 }