From 321f82368d50146fe3f22a97208036ed2d612ea0 Mon Sep 17 00:00:00 2001
From: Ole Markus With <o.with@sportradar.com>
Date: Sat, 15 Jan 2022 08:04:53 +0100
Subject: [PATCH] Don't try to add node name to instances without node object

---
 cmd/kops/get_instances.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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
 }