diff --git a/cmd/kops/get_instances.go b/cmd/kops/get_instances.go index 3a5b767dfd..d38e323e86 100644 --- a/cmd/kops/get_instances.go +++ b/cmd/kops/get_instances.go @@ -56,7 +56,7 @@ var ( type renderableCloudInstance struct { ID string `json:"id"` - NodeName string `json:"nodeName"` + NodeName string `json:"nodeName,omitempty"` Status string `json:"status"` Roles []string `json:"roles"` InternalIP string `json:"internalIP"` @@ -217,7 +217,6 @@ func asRenderable(instances []*cloudinstances.CloudInstance) []*renderableCloudI for i, ci := range instances { arr[i] = &renderableCloudInstance{ ID: ci.ID, - NodeName: ci.Node.Name, Status: ci.Status, Roles: ci.Roles, InternalIP: ci.PrivateIP, @@ -225,6 +224,9 @@ func asRenderable(instances []*cloudinstances.CloudInstance) []*renderableCloudI MachineType: ci.MachineType, State: string(ci.State), } + if ci.Node != nil { + arr[i].NodeName = ci.Node.Name + } } return arr }