[Helm3] Return chart version and metadata when listing (#1441)

vmware-tanzu · Jan 14, 2020 · 9c2df18 · 9c2df18
1 parent 4c489fa
commit 9c2df18
Show file tree

Hide file tree

Showing 5 changed files with 128 additions and 63 deletions.
diff --git a/cmd/kubeops/internal/handler/handler.go b/cmd/kubeops/internal/handler/handler.go
@@ -10,6 +10,7 @@ import (
 	"github.com/kubeapps/kubeapps/pkg/agent"
 	"github.com/kubeapps/kubeapps/pkg/auth"
 	chartUtils "github.com/kubeapps/kubeapps/pkg/chart"
+	"github.com/kubeapps/kubeapps/pkg/chart/helm3to2"
 	"github.com/kubeapps/kubeapps/pkg/handlerutil"
 	"github.com/urfave/negroni"
 	"helm.sh/helm/v3/pkg/action"
@@ -170,7 +171,7 @@ func upgradeRelease(cfg Config, w http.ResponseWriter, req *http.Request, params
 		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
 		return
 	}
-	compatRelease, err := newDashboardCompatibleRelease(*rel)
+	compatRelease, err := helm3to2.Convert(*rel)
 	if err != nil {
 		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
 		return
@@ -195,7 +196,7 @@ func rollbackRelease(cfg Config, w http.ResponseWriter, req *http.Request, param
 		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
 		return
 	}
-	compatRelease, err := newDashboardCompatibleRelease(*rel)
+	compatRelease, err := helm3to2.Convert(*rel)
 	if err != nil {
 		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
 		return
@@ -212,7 +213,7 @@ func GetRelease(cfg Config, w http.ResponseWriter, req *http.Request, params han
 		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
 		return
 	}
-	compatRelease, err := newDashboardCompatibleRelease(*release)
+	compatRelease, err := helm3to2.Convert(*release)
 	if err != nil {
 		response.NewErrorResponse(handlerutil.ErrorCode(err), err.Error()).Write(w)
 		return

diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -3,8 +3,8 @@ package agent
 import (
 	"errors"
 	"fmt"
-	"strconv"
 
+	"github.com/kubeapps/kubeapps/pkg/chart/helm3to2"
 	"github.com/kubeapps/kubeapps/pkg/proxy"
 	log "github.com/sirupsen/logrus"
 	"helm.sh/helm/v3/pkg/action"
@@ -199,11 +199,14 @@ func ParseDriverType(raw string) (StorageForDriver, error) {
 }
 
 func appOverviewFromRelease(r *release.Release) proxy.AppOverview {
+	r2Metadata := helm3to2.ConvertMetadata(*r.Chart.Metadata)
 	return proxy.AppOverview{
-		ReleaseName: r.Name,
-		Version:     strconv.Itoa(r.Version),
-		Icon:        r.Chart.Metadata.Icon,
-		Namespace:   r.Namespace,
-		Status:      r.Info.Status.String(),
+		ReleaseName:   r.Name,
+		Version:       r.Chart.Metadata.Version,
+		Icon:          r.Chart.Metadata.Icon,
+		Namespace:     r.Namespace,
+		Status:        r.Info.Status.String(),
+		Chart:         r.Chart.Name(),
+		ChartMetadata: *r2Metadata,
 	}
 }