Merge pull request #14 from robscott/rs/output-fixes

Some small fixes for output format
robscott · Apr 23, 2019 · 18d479f · 18d479f
2 parents 311014e + 863798d
commit 18d479f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/pkg/capacity/list.go b/pkg/capacity/list.go
@@ -33,7 +33,7 @@ type listPod struct {
 	Namespace  string              `json:"namespace"`
 	CPU        *listResourceOutput `json:"cpu"`
 	Memory     *listResourceOutput `json:"memory"`
-	Containers []listContainer     `json:"containers"`
+	Containers []listContainer     `json:"containers,omitempty"`
 }
 
 type listContainer struct {
@@ -44,16 +44,16 @@ type listContainer struct {
 
 type listResourceOutput struct {
 	Requests       string `json:"requests"`
-	RequestsPct    string `json:"requests_pct"`
+	RequestsPct    string `json:"requestsPercent"`
 	Limits         string `json:"limits"`
-	LimitsPct      string `json:"limits_pct"`
+	LimitsPct      string `json:"limitsPercent"`
 	Utilization    string `json:"utilization,omitempty"`
-	UtilizationPct string `json:"utilization_pct,omitempty"`
+	UtilizationPct string `json:"utilizationPercent,omitempty"`
 }
 
 type listClusterMetrics struct {
 	Nodes         []*listNodeMetric  `json:"nodes"`
-	ClusterTotals *listClusterTotals `json:"cluster_totals"`
+	ClusterTotals *listClusterTotals `json:"clusterTotals"`
 }
 
 type listClusterTotals struct {

diff --git a/pkg/capacity/table.go b/pkg/capacity/table.go
@@ -69,7 +69,6 @@ func (tp *tablePrinter) Print() {
 
 	for _, nm := range sortedNodeMetrics {
 		tp.printNodeLine(nm.name, nm)
-		tp.printLine(&tableLine{})
 
 		if tp.showPods || tp.showContainers {
 			podMetrics := nm.getSortedPodMetrics(tp.sortBy)

diff --git a/pkg/cmd/version.go b/pkg/cmd/version.go
@@ -28,6 +28,6 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version number of kube-capacity",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("kube-capacity version 0.3.0")
+		fmt.Println("kube-capacity version 0.3.1")
 	},
 }