kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't try to add node name to instances without node object

This commit is contained in:
Ole Markus With 2022-01-15 08:04:53 +01:00
parent 97b63d2fd4
commit 321f82368d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kops/get_instances.go
View File

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