Added helm version in the nova output (#25)

* added helm version in the nova output * update readme and file_test
FairwindsOps · Dec 3, 2020 · 2a8eae4 · 2a8eae4
1 parent 725b6da
commit 2a8eae4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ nova find --helm-version=auto --wide
 
 ### Options
 * `--helm-version` - which version of Helm to use. Options are `2`, `3`, and `auto` (default is `3`)
-* `--wide` - show `Chart Name` and `Namespace`
+* `--wide` - show `Chart Name`,  `Namespace` and `HelmVersion`
 * `--output-file` - output JSON to a file
 * `--url strings`, `-u` - URL for a helm chart repo (default [https://charts.fairwinds.com/stable,https://charts.fairwinds.com/incubator,https://kubernetes-charts.storage.googleapis.com,https://kubernetes-charts-incubator.storage.googleapis.com,https://charts.jetstack.io])
 * `--poll-helm-hub` - When true, polls all helm repos that publish to helm hub (Default is true).
@@ -106,6 +106,7 @@ nginx-ingress     1.25.0       1.40.3     true    false
                 "version": "v0.16.0",
                 "appVersion": "v0.16.0"
             },
+            "helmVersion": "v3",
             "outdated": true,
             "deprecated": false
         }

diff --git a/pkg/helm/cluster.go b/pkg/helm/cluster.go
@@ -72,8 +72,9 @@ func (h *Helm) GetHelmReleasesVersion3(helmRepos []*Repo) ([]output.ReleaseOutpu
 					Version:    newest.Version,
 					AppVersion: newest.AppVersion,
 				},
-				Deprecated: chart.Chart.Metadata.Deprecated,
-				IsOld:      version.Compare(newest.Version, chart.Chart.Metadata.Version, ">"),
+				HelmVersion: "v3",
+				Deprecated:  chart.Chart.Metadata.Deprecated,
+				IsOld:       version.Compare(newest.Version, chart.Chart.Metadata.Version, ">"),
 			}
 			outputObjects = append(outputObjects, rls)
 		}
@@ -113,8 +114,9 @@ func (h *Helm) GetHelmReleasesVersion2(helmRepos []*Repo) ([]output.ReleaseOutpu
 					Version:    newest.Version,
 					AppVersion: newest.AppVersion,
 				},
-				Deprecated: chart.Chart.Metadata.Deprecated,
-				IsOld:      version.Compare(newest.Version, chart.Chart.Metadata.Version, ">"),
+				HelmVersion: "v2",
+				Deprecated:  chart.Chart.Metadata.Deprecated,
+				IsOld:       version.Compare(newest.Version, chart.Chart.Metadata.Version, ">"),
 			}
 			outputObjects = append(outputObjects, rls)
 		}

diff --git a/pkg/output/file_test.go b/pkg/output/file_test.go
@@ -37,6 +37,7 @@ func TestFileOutput_Send(t *testing.T) {
 					Version:    "1.0",
 					AppVersion: "2.0.0",
 				},
+				HelmVersion: "v3",
 				Home:        "https://wiki.example.com",
 				Deprecated:  false,
 				Description: "Test description for foo chart",

diff --git a/pkg/output/output.go b/pkg/output/output.go
@@ -39,8 +39,9 @@ type ReleaseOutput struct {
 	Icon        string `json:"icon,omitempty"`
 	Installed   VersionInfo
 	Latest      VersionInfo
-	IsOld       bool `json:"outdated"`
-	Deprecated  bool `json:"deprecated"`
+	IsOld       bool   `json:"outdated"`
+	Deprecated  bool   `json:"deprecated"`
+	HelmVersion string `json:"helmVersion"`
 }
 
 // VersionInfo contains both a chart version and an app version
@@ -72,7 +73,7 @@ func (output Output) Print(wide bool) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 4, 4, ' ', 0)
 	header := "Release Name\t"
 	if wide {
-		header += "Chart Name\tNamespace\t"
+		header += "Chart Name\tNamespace\tHelmVersion\t"
 	}
 	header += "Installed\tLatest\tOld\tDeprecated"
 	fmt.Fprintln(w, header)
@@ -82,6 +83,7 @@ func (output Output) Print(wide bool) {
 		if wide {
 			line += release.ChartName + "\t"
 			line += release.Namespace + "\t"
+			line += release.HelmVersion + "\t"
 		}
 		line += release.Installed.Version + "\t"
 		line += release.Latest.Version + "\t"