Show warm pool nodes in get instances

kubernetes · Apr 13, 2021 · 69ef5bf · 69ef5bf
1 parent a4a7874
commit 69ef5bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cmd/kops/get_instances.go b/cmd/kops/get_instances.go
@@ -174,7 +174,11 @@ func instanceOutputTable(instances []*cloudinstances.CloudInstance, out io.Write
 	t.AddColumn("MACHINE-TYPE", func(i *cloudinstances.CloudInstance) string {
 		return i.MachineType
 	})
-	columns := []string{"ID", "NODE-NAME", "STATUS", "ROLES", "INTERNAL-IP", "INSTANCE-GROUP", "MACHINE-TYPE"}
+	t.AddColumn("STATE", func(i *cloudinstances.CloudInstance) string {
+		return string(i.State)
+	})
+
+	columns := []string{"ID", "NODE-NAME", "STATUS", "ROLES", "INTERNAL-IP", "INSTANCE-GROUP", "MACHINE-TYPE", "STATE"}
 	return t.Render(instances, os.Stdout, columns...)
 }
 

diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go
@@ -669,15 +669,12 @@ func getNodeConfigFromServer(ctx context.Context, config *nodeup.ConfigServerOpt
 }
 
 func getAWSConfigurationMode(c *model.NodeupModelContext) (string, error) {
-<<<<<<< HEAD
 	// Only worker nodes and apiservers can actually autoscale.
 	// We are not adding describe permissions to the other roles
 	role := c.InstanceGroup.Spec.Role
 	if role != api.InstanceGroupRoleNode && role != api.InstanceGroupRoleAPIServer {
 		return "", nil
 	}
-=======
->>>>>>> 46f3f10432... Don't start kubelet if we are warming
 
 	svc := c.Cloud.(awsup.AWSCloud).Autoscaling()