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

Improve kops get instances when api is unavailable 

When the api is unavailable, kops will say all the nodes have not yet
joined the cluster. That is not the case simply because e.g the admin
credentials have been expired. This PR makes it a bit more clear that we
cannot know the node name when the API is unavailable.
This commit is contained in:
Ole Markus With 2020-09-15 10:11:35 +02:00
parent 88748fe7b7
commit 31ee079c7b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kops/get_instances.go
View File

@ -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{}) nodeList, err := k8sClient.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
if err != nil { 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{}) igList, err := clientset.InstanceGroupsFor(cluster).List(ctx, metav1.ListOptions{})
@ -144,6 +144,7 @@ func RunGetInstances(ctx context.Context, f *util.Factory, out io.Writer, option
} }
func instanceOutputTable(instances []*cloudinstances.CloudInstance, out io.Writer) error { func instanceOutputTable(instances []*cloudinstances.CloudInstance, out io.Writer) error {
fmt.Println("")
t := &tables.Table{} t := &tables.Table{}
t.AddColumn("ID", func(i *cloudinstances.CloudInstance) string { t.AddColumn("ID", func(i *cloudinstances.CloudInstance) string {
return i.ID return i.ID
@ -151,7 +152,7 @@ func instanceOutputTable(instances []*cloudinstances.CloudInstance, out io.Write
t.AddColumn("NODE-NAME", func(i *cloudinstances.CloudInstance) string { t.AddColumn("NODE-NAME", func(i *cloudinstances.CloudInstance) string {
node := i.Node node := i.Node
if node == nil { if node == nil {
return "NotJoined" return ""
} else { } else {
return node.Name return node.Name
} }
@ -171,7 +172,8 @@ func instanceOutputTable(instances []*cloudinstances.CloudInstance, out io.Write
t.AddColumn("MACHINE-TYPE", func(i *cloudinstances.CloudInstance) string { t.AddColumn("MACHINE-TYPE", func(i *cloudinstances.CloudInstance) string {
return i.MachineType 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) { func createK8sClient(cluster *kops.Cluster) (*kubernetes.Clientset, error) {