Merge branch 'main' of github.com:komodorio/helm-dashboard

Fixes #226

README.md

@@ -9,7 +9,7 @@
 <p align="center">A simplified way of working with Helm.</p>
 
 
-![GitHub contributors](https://img.shields.io/github/contributors/komodorio/helm-dashboard) [![GitHub issues](https://img.shields.io/github/issues-raw/komodorio/helm-dashboard)](https://github.com/komodorio/helm-dashboard/issues) ![GitHub stars](https://img.shields.io/github/stars/komodorio/helm-dashboard?style=social) ![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/komodorio/helm-dashboard) ![GitHub pull requests](https://img.shields.io/github/issues-pr/komodorio/helm-dashboard) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/komodorio/helm-dashboard) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/komodorio/helm-dashboard) [![GitHub license](https://img.shields.io/github/license/komodorio/helm-dashboard)](https://github.com/komodorio/helm-dashboard)
+![GitHub contributors](https://img.shields.io/github/contributors/komodorio/helm-dashboard) [![GitHub issues](https://img.shields.io/github/issues-raw/komodorio/helm-dashboard)](https://github.com/komodorio/helm-dashboard/issues) ![GitHub stars](https://img.shields.io/github/stars/komodorio/helm-dashboard?style=social) ![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/komodorio/helm-dashboard) ![GitHub pull requests](https://img.shields.io/github/issues-pr/komodorio/helm-dashboard) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/komodorio/helm-dashboard)](https://github.com/komodorio/helm-dashboard/releases) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/komodorio/helm-dashboard) [![GitHub license](https://img.shields.io/github/license/komodorio/helm-dashboard)](https://github.com/komodorio/helm-dashboard)
 
 <kbd>[<img src="images/screenshot.png" style="width: 100%; border: 1px solid silver;" border="1" alt="Screenshot">](images/screenshot.png)</kbd>
 

charts/helm-dashboard/Chart.yaml

@@ -5,5 +5,5 @@ name: helm-dashboard
 description: A GUI Dashboard for Helm by Komodor
 icon: "https://raw.githubusercontent.com/komodorio/helm-dashboard/main/pkg/dashboard/static/logo.svg"
 
-version: 0.1.6
+version: 0.1.7
-appVersion: "1.2.0" 
+appVersion: "1.3.0" 

charts/helm-dashboard/templates/pvc.yaml

@@ -14,8 +14,10 @@ spec:
   {{- if .Values.dashboard.persistence.hostPath }}
   storageClassName: ""
   {{- else }}
+  {{- if kindIs "string" .Values.dashboard.persistence.storageClass }}
   storageClassName: "{{ .Values.dashboard.persistence.storageClass }}"
   {{- end }}
+  {{- end }}
   accessModes:
   {{- if not (empty .Values.dashboard.persistence.accessModes) }}
   {{- range .Values.dashboard.persistence.accessModes }}

charts/helm-dashboard/values.yaml

@@ -43,7 +43,7 @@ dashboard:
     ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
     ##   GKE, AWS & OpenStack)
     ##
-    storageClass: ""
+    storageClass: null
 
     ## Helm Dashboard Persistent Volume access modes
     ## Must match those of existing PV or dynamic provisioner

go.mod

@@ -48,7 +48,7 @@ require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/docker/cli v20.10.21+incompatible // indirect
 	github.com/docker/distribution v2.8.1+incompatible // indirect
-	github.com/docker/docker v20.10.21+incompatible // indirect
+	github.com/docker/docker v20.10.24+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect

go.sum

@@ -135,8 +135,8 @@ github.com/docker/cli v20.10.21+incompatible h1:qVkgyYUnOLQ98LtXBrwd/duVqPT2X4SH
 github.com/docker/cli v20.10.21+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v20.10.21+incompatible h1:UTLdBmHk3bEY+w8qeO5KttOhy6OmXWsl/FEet9Uswog=
+github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
-github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
 github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=

pkg/dashboard/handlers/helmHandlers.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
 	"net/http"
 	"sort"
@@ -133,8 +134,19 @@ func (h *HelmHandler) Resources(c *gin.Context) {
 
 	res, err := objects.ParseManifests(rel.Orig.Manifest)
 	if err != nil {
-		_ = c.AbortWithError(http.StatusInternalServerError, err)
+		res = append(res, &v1.Carp{
-		return
+			TypeMeta: metav1.TypeMeta{Kind: "ManifestParseError"},
+			ObjectMeta: metav1.ObjectMeta{
+				Name: err.Error(),
+			},
+			Spec: v1.CarpSpec{},
+			Status: v1.CarpStatus{
+				Phase:   "BrokenManifest",
+				Message: err.Error(),
+			},
+		})
+		//_ = c.AbortWithError(http.StatusInternalServerError, err)
+		//return
 	}
 
 	if c.Query("health") != "" { // we need  to query k8s for health status

pkg/dashboard/objects/data.go

@@ -20,6 +20,7 @@ import (
 	"helm.sh/helm/v3/pkg/release"
 	v1 "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
 	"k8s.io/client-go/tools/clientcmd"
+	//"sigs.k8s.io/yaml"
 )
 
 type DataLayer struct {
@@ -113,20 +114,20 @@ func ParseManifests(out string) ([]*v1.Carp, error) {
 		}
 
 		if err != nil {
-			return nil, errorx.Decorate(err, "failed to parse manifest document #%d", len(res)+1)
+			return res, errorx.Decorate(err, "failed to parse manifest document #%d", len(res)+1)
 		}
 
 		// k8s libs uses only JSON tags defined, say hello to https://github.com/go-yaml/yaml/issues/424
 		// we can juggle it
 		jsoned, err := json.Marshal(tmp)
 		if err != nil {
-			return nil, err
+			return res, err
 		}
 
 		var doc v1.Carp
 		err = json.Unmarshal(jsoned, &doc)
 		if err != nil {
-			return nil, err
+			return res, err
 		}
 
 		if doc.Kind == "" {

pkg/dashboard/static/scripts.js

@@ -129,6 +129,7 @@ function reportError(err, xhr) {
         $("#errorAlert p").text(xhr.responseText)
     }
     $("#errorAlert").show()
+    sendStats("errorReported", {"errMessage": err})
 }
 
 

plugin.yaml

@@ -1,5 +1,5 @@
 name: "dashboard"
-version: "1.2.0" 
+version: "1.3.0" 
 usage: "A simplified way of working with Helm"
 description: "View HELM situation in nice web UI"
 command: "$HELM_PLUGIN_DIR/bin/helm-dashboard"