1
0
mirror of https://github.com/rancher/types.git synced 2025-07-02 00:11:48 +00:00

NodeConfig to machine spec

This commit is contained in:
Alena Prokharchyk 2017-12-14 14:20:13 -08:00
parent c737603e29
commit 5f894bad0d
4 changed files with 14 additions and 0 deletions

View File

@ -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 {

View File

@ -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
}

View File

@ -40,6 +40,7 @@ const (
MachineFieldLimits = "limits"
MachineFieldMachineTemplateId = "machineTemplateId"
MachineFieldName = "name"
MachineFieldNodeConfig = "nodeConfig"
MachineFieldOwnerReferences = "ownerReferences"
MachineFieldPhase = "phase"
MachineFieldPodCIDR = "podCIDR"
@ -96,6 +97,7 @@ type Machine struct {
Limits map[string]string `json:"limits,omitempty"`
MachineTemplateId string `json:"machineTemplateId,omitempty"`
Name string `json:"name,omitempty"`
NodeConfig *RKEConfigNode `json:"nodeConfig,omitempty"`
OwnerReferences []OwnerReference `json:"ownerReferences,omitempty"`
Phase string `json:"phase,omitempty"`
PodCIDR string `json:"podCIDR,omitempty"`

View File

@ -11,6 +11,7 @@ const (
MachineStatusFieldIPAddress = "ipAddress"
MachineStatusFieldInfo = "info"
MachineStatusFieldLimits = "limits"
MachineStatusFieldNodeConfig = "nodeConfig"
MachineStatusFieldNodeName = "nodeName"
MachineStatusFieldPhase = "phase"
MachineStatusFieldProvisioned = "provisioned"
@ -31,6 +32,7 @@ type MachineStatus struct {
IPAddress string `json:"ipAddress,omitempty"`
Info *NodeInfo `json:"info,omitempty"`
Limits map[string]string `json:"limits,omitempty"`
NodeConfig *RKEConfigNode `json:"nodeConfig,omitempty"`
NodeName string `json:"nodeName,omitempty"`
Phase string `json:"phase,omitempty"`
Provisioned *bool `json:"provisioned,omitempty"`