From a08c28e9d80baf9a7d5a0494ac362afbc03ef487 Mon Sep 17 00:00:00 2001 From: Daishan Peng Date: Wed, 13 Dec 2017 14:40:59 -0700 Subject: [PATCH 1/2] add ssh user type --- apis/management.cattle.io/v3/machine_types.go | 1 + 1 file changed, 1 insertion(+) diff --git a/apis/management.cattle.io/v3/machine_types.go b/apis/management.cattle.io/v3/machine_types.go index 693b2f3a..28fd7891 100644 --- a/apis/management.cattle.io/v3/machine_types.go +++ b/apis/management.cattle.io/v3/machine_types.go @@ -65,6 +65,7 @@ type MachineStatus struct { Requested v1.ResourceList `json:"requested,omitempty"` Limits v1.ResourceList `json:"limits,omitempty"` Provisioned bool `json:"provisioned,omitempty"` + SSHUser string `json:"sshUser,omitempty"` SSHPrivateKey string `json:"sshPrivateKey,omitempty"` ExtractedConfig string `json:"extractedConfig,omitempty"` } From 6609b356ef25a2de2417939c03dd3d48fba7911f Mon Sep 17 00:00:00 2001 From: Daishan Peng Date: Wed, 13 Dec 2017 14:42:40 -0700 Subject: [PATCH 2/2] generate changes --- client/management/v3/zz_generated_machine.go | 2 ++ client/management/v3/zz_generated_machine_status.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/client/management/v3/zz_generated_machine.go b/client/management/v3/zz_generated_machine.go index 353a533e..3020ee44 100644 --- a/client/management/v3/zz_generated_machine.go +++ b/client/management/v3/zz_generated_machine.go @@ -48,6 +48,7 @@ const ( MachineFieldRequested = "requested" MachineFieldResourcePath = "resourcePath" MachineFieldSSHPrivateKey = "sshPrivateKey" + MachineFieldSSHUser = "sshUser" MachineFieldState = "state" MachineFieldTaints = "taints" MachineFieldTransitioning = "transitioning" @@ -102,6 +103,7 @@ type Machine struct { Requested map[string]string `json:"requested,omitempty"` ResourcePath string `json:"resourcePath,omitempty"` SSHPrivateKey string `json:"sshPrivateKey,omitempty"` + SSHUser string `json:"sshUser,omitempty"` State string `json:"state,omitempty"` Taints []Taint `json:"taints,omitempty"` Transitioning string `json:"transitioning,omitempty"` diff --git a/client/management/v3/zz_generated_machine_status.go b/client/management/v3/zz_generated_machine_status.go index 82f25550..38aa7fbe 100644 --- a/client/management/v3/zz_generated_machine_status.go +++ b/client/management/v3/zz_generated_machine_status.go @@ -15,6 +15,7 @@ const ( MachineStatusFieldProvisioned = "provisioned" MachineStatusFieldRequested = "requested" MachineStatusFieldSSHPrivateKey = "sshPrivateKey" + MachineStatusFieldSSHUser = "sshUser" MachineStatusFieldVolumesAttached = "volumesAttached" MachineStatusFieldVolumesInUse = "volumesInUse" ) @@ -33,6 +34,7 @@ type MachineStatus struct { Provisioned *bool `json:"provisioned,omitempty"` Requested map[string]string `json:"requested,omitempty"` SSHPrivateKey string `json:"sshPrivateKey,omitempty"` + SSHUser string `json:"sshUser,omitempty"` VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"` VolumesInUse []string `json:"volumesInUse,omitempty"` }