From 69ef5bfad0b96a1b7d934530806f4fbb31831458 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Mon, 12 Apr 2021 20:46:42 +0200 Subject: [PATCH] Show warm pool nodes in get instances --- cmd/kops/get_instances.go | 6 +++++- upup/pkg/fi/nodeup/command.go | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/kops/get_instances.go b/cmd/kops/get_instances.go index 92b0553af6705..ed3e38f5e81b3 100644 --- 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 index 76cfb7b1bc534..31337528e007e 100644 --- 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()