Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve kops get instances when api is unavailable #9938

Merged
merged 1 commit into from
Sep 19, 2020
Merged

Improve kops get instances when api is unavailable #9938

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cmd/kops/get_instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func RunGetInstances(ctx context.Context, f *util.Factory, out io.Writer, option

nodeList, err := k8sClient.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
if err != nil {
klog.V(2).Infof("error listing nodes: %v", err)
klog.Warningf("cannot list node names. Kubernetes API unavailable: %v", err)
}

igList, err := clientset.InstanceGroupsFor(cluster).List(ctx, metav1.ListOptions{})
Expand Down Expand Up @@ -144,14 +144,15 @@ func RunGetInstances(ctx context.Context, f *util.Factory, out io.Writer, option
}

func instanceOutputTable(instances []*cloudinstances.CloudInstance, out io.Writer) error {
fmt.Println("")
t := &tables.Table{}
t.AddColumn("ID", func(i *cloudinstances.CloudInstance) string {
return i.ID
})
t.AddColumn("NODE-NAME", func(i *cloudinstances.CloudInstance) string {
node := i.Node
if node == nil {
return "NotJoined"
return ""
} else {
return node.Name
}
Expand All @@ -171,7 +172,8 @@ func instanceOutputTable(instances []*cloudinstances.CloudInstance, out io.Write
t.AddColumn("MACHINE-TYPE", func(i *cloudinstances.CloudInstance) string {
return i.MachineType
})
return t.Render(instances, os.Stdout, "ID", "NODE-NAME", "STATUS", "ROLES", "INTERNAL-IP", "INSTANCE-GROUP", "MACHINE-TYPE")
columns := []string{"ID", "NODE-NAME", "STATUS", "ROLES", "INTERNAL-IP", "INSTANCE-GROUP", "MACHINE-TYPE"}
return t.Render(instances, os.Stdout, columns...)
}

func createK8sClient(cluster *kops.Cluster) (*kubernetes.Clientset, error) {
Expand Down