Add support for secrets for helm v2 (#79)

* Add support for helm v2 secrets
* e2e test for --helm-store configmaps & secrets

README.md

@@ -107,6 +107,8 @@ invincible-zebu-metrics-server   Deployment   extensions/v1beta1   apps/v1
 lunging-bat-metrics-server       Deployment   apps/v1                            false     false
 ```
 
+In case you have configured helm 2 with `--storage=secret`, you can add the optional `--helm-store secrets`. Default configuration for helm 2 is configmaps.
+
 If you only have access to a certain namespace (helm 3), or if you only want to see information for a single namespace, you can pass the `--namespace` or `-n` flag to restrict the output. Due to the way that helm2 stores configmaps, you will still need access to the tiller namespace if you are using helm 2.
 
 ```

cmd/root.go

@@ -38,6 +38,7 @@ var (
 	outputFormat       string
 	showAll            bool
 	helmVersion        string
+	helmStore          string
 	ignoreDeprecations bool
 	ignoreRemovals     bool
 	targetVersion      string
@@ -58,6 +59,7 @@ func init() {
 	rootCmd.AddCommand(detectHelmCmd)
 	detectHelmCmd.PersistentFlags().StringVar(&helmVersion, "helm-version", "3", "Helm version in current cluster (2|3)")
 	detectHelmCmd.PersistentFlags().StringVarP(&namespace, "namespace", "n", "", "Only detect releases in a specific namespace.")
+	detectHelmCmd.PersistentFlags().StringVar(&helmStore, "helm-store", "configmaps", "Helm storage for v2 (configmaps|secrets)")
 
 	rootCmd.AddCommand(listVersionsCmd)
 	rootCmd.AddCommand(detectCmd)
@@ -135,7 +137,7 @@ var detectHelmCmd = &cobra.Command{
 	Short: "detect-helm",
 	Long:  `Detect Kubernetes apiVersions in a helm release (in cluster)`,
 	Run: func(cmd *cobra.Command, args []string) {
-		h := helm.NewHelm(helmVersion, namespace)
+		h := helm.NewHelm(helmVersion, helmStore, namespace)
 		err := h.FindVersions()
 		if err != nil {
 			fmt.Println("Error running helm-detect:", err)
@@ -158,6 +160,12 @@ var detectHelmCmd = &cobra.Command{
 		klog.V(5).Infof("retCode: %d", retCode)
 		os.Exit(retCode)
 	},
+	PreRun: func(cmd *cobra.Command, args []string) {
+		if helmStore != "secrets" && helmStore != "configmaps" && helmVersion == "2" {
+			fmt.Println("helm-store should be configmaps or secrets")
+			os.Exit(1)
+		}
+	},
 }
 
 var detectCmd = &cobra.Command{

e2e/tests/02_helm-detect-2.yaml

@@ -1,7 +1,7 @@
 version: "2"
 name: "Static Code Files (including helm)"
 testcases:
-- name: install helm 2 configmaps
+- name: install helm 2 configmaps and secrets
   steps:
   - script: |
       kubectl create ns helm-system
@@ -34,6 +34,23 @@ testcases:
     - result.code ShouldEqual 0
     - result.systemout ShouldContainSubstring "NAME                                       NAMESPACE   KIND         VERSION   REPLACEMENT   DEPRECATED   DEPRECATED IN   REMOVED   REMOVED IN"
     - result.systemout ShouldContainSubstring "kindled-toucan/kindled-toucan-basic-demo   demo1       Deployment   apps/v1                 false                        false"
+
+- name: helm2 detect in-cluster show-all wide namespaced confimaps
+  steps:
+  - script: pluto detect-helm --helm-version=2 --helm-store configmaps -A -t v1.15.0 -owide -n demo1
+    assertions:
+    - result.code ShouldEqual 0
+    - result.systemout ShouldContainSubstring "NAME                                       NAMESPACE   KIND         VERSION   REPLACEMENT   DEPRECATED   DEPRECATED IN   REMOVED   REMOVED IN"
+    - result.systemout ShouldContainSubstring "kindled-toucan/kindled-toucan-basic-demo   demo1       Deployment   apps/v1                 false                        false"
+
+- name: helm2 detect show all wide namespaced secrets
+  steps:
+  - script: pluto detect-helm --helm-version=2 --helm-store secrets -A -t v1.16.0 -owide
+    assertions:
+    - result.code ShouldEqual 3
+    - result.systemout ShouldContainSubstring "NAME                                             NAMESPACE   KIND         VERSION              REPLACEMENT   DEPRECATED   DEPRECATED IN   REMOVED   REMOVED IN"
+    - result.systemout ShouldContainSubstring "invincible-zebu/invincible-zebu-metrics-server   default     Deployment   extensions/v1beta1   apps/v1       true         v1.9.0          true      v1.16.0"
+
 - name: cleanup
   steps:
   - script: |

e2e/tests/assets/helm2/helm2secrets-deprecated.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+data:
+  release: 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

+kind: Secret
+metadata:
+  creationTimestamp: "2020-04-02T21:24:40Z"
+  labels:
+    MODIFIED_AT: "1585862680"
+    NAME: invincible-zebu
+    OWNER: TILLER
+    STATUS: DEPLOYED
+    VERSION: "1"
+  name: invincible-zebu.v1
+  namespace: helm-system
+  resourceVersion: "265249"
+  selfLink: /api/v1/namespaces/helm-system/configmaps/invincible-zebu.v1
+  uid: 362f70c7-91dc-4478-88eb-08a7b368bfd0

pkg/helm/helm.go

@@ -33,6 +33,7 @@ type Helm struct {
 	Version   string
 	Kube      *kube
 	Namespace string
+	Store     string
 }
 
 // Release represents a single helm release
@@ -55,11 +56,12 @@ type ChartMeta struct {
 }
 
 // NewHelm returns a basic helm struct with the version of helm requested
-func NewHelm(version string, namespace string) *Helm {
+func NewHelm(version, store, namespace string) *Helm {
 	return &Helm{
 		Version:   version,
 		Kube:      getConfigInstance(),
 		Namespace: namespace,
+		Store:     store,
 	}
 }
 
@@ -78,13 +80,22 @@ func (h *Helm) FindVersions() error {
 	return err
 }
 
-// getReleasesVersionTwo retrieves helm 2 releases from ConfigMaps
+// getReleasesVersionTwo retrieves helm 2 releases from ConfigMaps or Secrets
 func (h *Helm) getReleasesVersionTwo() error {
+	var helmClient *helmstoragev2.Storage
 	if h.Version != "2" {
 		return fmt.Errorf("helm 2 function called without helm 2 version set")
 	}
-	hcm := driverv2.NewConfigMaps(h.Kube.Client.CoreV1().ConfigMaps(""))
-	helmClient := helmstoragev2.Init(hcm)
+	switch h.Store {
+	case "secrets":
+		hs := driverv2.NewSecrets(h.Kube.Client.CoreV1().Secrets(h.Namespace))
+		helmClient = helmstoragev2.Init(hs)
+	case "configmaps":
+		hcm := driverv2.NewConfigMaps(h.Kube.Client.CoreV1().ConfigMaps(""))
+		helmClient = helmstoragev2.Init(hcm)
+	default:
+		return fmt.Errorf("helm-store should be configmap or secrets")
+	}
 	list, err := helmClient.ListReleases()
 	if err != nil {
 		return err