Subcommand aliases and node status on node subcommand

akrzos · Jan 8, 2021 · 252ec62 · 252ec62
1 parent b909816
commit 252ec62
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 19 deletions.
diff --git a/cmd/capacity/cluster.go b/cmd/capacity/cluster.go
@@ -30,11 +30,10 @@ import (
 )
 
 var clusterCmd = &cobra.Command{
-	Use:           "cluster",
-	Short:         "Get cluster size and capacity",
-	Long:          `Get Kubernetes cluster size and capacity metrics`,
-	SilenceErrors: true,
-	SilenceUsage:  true,
+	Use:     "cluster",
+	Aliases: []string{"c"},
+	Short:   "Get cluster size and capacity",
+	Long:    `Get Kubernetes cluster size and capacity metrics`,
 	PreRun: func(cmd *cobra.Command, args []string) {
 		viper.BindPFlags(cmd.Flags())
 		if err := output.ValidateOutput(*cmd); err != nil {

diff --git a/cmd/capacity/namespace.go b/cmd/capacity/namespace.go
@@ -31,9 +31,10 @@ import (
 )
 
 var namespaceCmd = &cobra.Command{
-	Use:   "namespace",
-	Short: "Get namespace size",
-	Long:  `Get namespace size and capacity metrics`,
+	Use:     "namespace",
+	Aliases: []string{"na"},
+	Short:   "Get namespace size",
+	Long:    `Get namespace size and capacity metrics`,
 	PreRun: func(cmd *cobra.Command, args []string) {
 		viper.BindPFlags(cmd.Flags())
 		if err := output.ValidateOutput(*cmd); err != nil {

diff --git a/cmd/capacity/node.go b/cmd/capacity/node.go
@@ -33,11 +33,10 @@ import (
 )
 
 var nodeCmd = &cobra.Command{
-	Use:           "node",
-	Short:         "Get individual node capacity",
-	Long:          `Get individual node size and capacity metrics grouped by node role`,
-	SilenceErrors: true,
-	SilenceUsage:  true,
+	Use:     "node",
+	Aliases: []string{"no"},
+	Short:   "Get individual node capacity",
+	Long:    `Get individual node size and capacity metrics grouped by node role`,
 	PreRun: func(cmd *cobra.Command, args []string) {
 		viper.BindPFlags(cmd.Flags())
 		if err := output.ValidateOutput(*cmd); err != nil {
@@ -93,6 +92,14 @@ var nodeCmd = &cobra.Command{
 			newNodeData := new(output.NodeCapacityData)
 			newNodeData.TotalPodCount = len(nodePodsList.Items)
 			newNodeData.TotalNonTermPodCount = len(totalNonTermPodsList.Items)
+			newNodeData.Ready = false
+			for _, condition := range v.Status.Conditions {
+				if (condition.Type == "Ready") && condition.Status == corev1.ConditionTrue {
+					newNodeData.Ready = true
+					break
+				}
+			}
+			newNodeData.Schedulable = !v.Spec.Unschedulable
 			newNodeData.Roles = roles
 			newNodeData.TotalCapacityPods.Add(*v.Status.Capacity.Pods())
 			newNodeData.TotalCapacityCPU.Add(*v.Status.Capacity.Cpu())

diff --git a/cmd/capacity/noderole.go b/cmd/capacity/noderole.go
@@ -34,9 +34,10 @@ import (
 )
 
 var nodeRoleCmd = &cobra.Command{
-	Use:   "node-role",
-	Short: "Get cluster capacity grouped by node role",
-	Long:  `Get Kubernetes cluster size and capacity metrics grouped by node role`,
+	Use:     "node-role",
+	Aliases: []string{"nr"},
+	Short:   "Get cluster capacity grouped by node role",
+	Long:    `Get Kubernetes cluster size and capacity metrics grouped by node role`,
 	PreRun: func(cmd *cobra.Command, args []string) {
 		viper.BindPFlags(cmd.Flags())
 		if err := output.ValidateOutput(*cmd); err != nil {

diff --git a/internal/output/output.go b/internal/output/output.go
@@ -51,6 +51,8 @@ type NodeCapacityData struct {
 	TotalPodCount          int
 	TotalNonTermPodCount   int
 	Roles                  sets.String
+	Ready                  bool
+	Schedulable            bool
 	TotalCapacityPods      resource.Quantity
 	TotalCapacityCPU       resource.Quantity
 	TotalCapacityMemory    resource.Quantity
@@ -165,14 +167,23 @@ func DisplayNodeData(nodesCapacityData map[string]*NodeCapacityData, sortedNodeN
 		w := new(tabwriter.Writer)
 		w.Init(os.Stdout, 0, 5, 1, ' ', 0)
 		if displayReadable == true {
-			fmt.Fprintln(w, "NAME\tROLES\tPODS\t\t\t\tCPU (cores)\t\t\t\tMEMORY (GiB)\t\t")
+			fmt.Fprintln(w, "NAME\tSTATUS\tROLES\tPODS\t\t\t\tCPU (cores)\t\t\t\tMEMORY (GiB)\t\t")
 		} else {
-			fmt.Fprintln(w, "NAME\tROLES\tPODS\t\t\t\tCPU\t\t\t\tMEMORY\t\t")
+			fmt.Fprintln(w, "NAME\tSTATUS\tROLES\tPODS\t\t\t\tCPU\t\t\t\tMEMORY\t\t")
 		}
-		fmt.Fprintln(w, "\t\tCapacity\tAllocatable\tTotal\tNon-Term\tCapacity\tAllocatable\tRequests\tLimits\tCapacity\tAllocatable\tRequests\tLimits")
+		fmt.Fprintln(w, "\t\t\tCapacity\tAllocatable\tTotal\tNon-Term\tCapacity\tAllocatable\tRequests\tLimits\tCapacity\tAllocatable\tRequests\tLimits")
 
 		for _, k := range sortedNodeNames {
 			fmt.Fprintf(w, "%s\t", k)
+			if nodesCapacityData[k].Ready {
+				fmt.Fprint(w, "Ready")
+			} else {
+				fmt.Fprint(w, "NotReady")
+			}
+			if !nodesCapacityData[k].Schedulable {
+				fmt.Fprintf(w, ",Unschedulable")
+			}
+			fmt.Fprintf(w, "\t")
 			fmt.Fprintf(w, "%s\t", strings.Join(nodesCapacityData[k].Roles.List(), ","))
 			fmt.Fprintf(w, "%s\t%s\t", &nodesCapacityData[k].TotalCapacityPods, &nodesCapacityData[k].TotalCapacityPods)
 			fmt.Fprintf(w, "%d\t%d\t", nodesCapacityData[k].TotalPodCount, nodesCapacityData[k].TotalNonTermPodCount)