Merge pull request #450 from Revolyssup/fix#441

Fix failed linkerd installation with MeshOps V1

Author: Revolyssup

internal/config/operations.go

@@ -17,6 +17,7 @@ package config
 import (
 	"github.com/layer5io/meshery-adapter-library/adapter"
 	"github.com/layer5io/meshery-adapter-library/meshes"
+	"github.com/layer5io/meshkit/utils"
 )
 
 var (
@@ -25,7 +26,8 @@ var (
 
 func getOperations(dev adapter.Operations) adapter.Operations {
 	var adapterVersions []adapter.Version
-	versions, _ := GetLatestReleaseNames(30)
+
+	versions, _ := utils.GetLatestReleaseTagsSorted("linkerd", "linkerd2")
 	for _, v := range versions {
 		adapterVersions = append(adapterVersions, adapter.Version(v))
 	}

linkerd/install.go

@@ -83,12 +83,15 @@ func (linkerd *Linkerd) installLinkerd(del bool, version, namespace string, kube
 	return status.Installed, nil
 }
 
-func (linkerd *Linkerd) applyHelmChart(version string, namespace string, isDel bool, kubeconfigs []string) error {
-	loc, cver := getChartLocationAndVersion(version)
-	if loc == "" || cver == "" {
+func (linkerd *Linkerd) applyHelmChart(appversion string, namespace string, isDel bool, kubeconfigs []string) error {
+	loc, ver := getChartLocationAndVersion(appversion)
+	if loc == "" || ver == "" {
 		return ErrInvalidVersionForMeshInstallation
 	}
-
+	cver, err := mesherykube.HelmAppVersionToChartVersion(loc, "linkerd2", ver)
+	if err != nil {
+		return ErrApplyHelmChart(err)
+	}
 	// Generate certificates for linkerd
 	c, pk, err := cert.GenerateRootCAWithDefaults("cluster.local")
 	if err != nil {
@@ -187,11 +190,11 @@ func (linkerd *Linkerd) applyHelmChart(version string, namespace string, isDel b
 
 func getChartLocationAndVersion(version string) (string, string) {
 	if strings.HasPrefix(version, "edge-") {
-		return LinkerdHelmEdgeRepo, strings.TrimPrefix(version, "edge-")
+		return LinkerdHelmEdgeRepo, version
 	}
 
 	if strings.HasPrefix(version, "stable-") {
-		return LinkerdHelmStableRepo, strings.TrimPrefix(version, "stable-")
+		return LinkerdHelmStableRepo, version
 	}
 
 	return "", ""