Merge pull request #2631 from mschoenlaub/fix-list-helm-deployments

fix: consider helm release name when showing helm deployment status

Author: FabianKramm

pkg/devspace/deploy/deployer/helm/status.go

@@ -3,6 +3,7 @@ package helm
 import (
 	"fmt"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	"github.com/loft-sh/devspace/pkg/devspace/helm/types"
 
 	"github.com/loft-sh/devspace/pkg/devspace/deploy/deployer"
 	"github.com/loft-sh/devspace/pkg/devspace/helm"
@@ -44,7 +45,7 @@ func (d *DeployConfig) Status(ctx devspacecontext.Context) (*deployer.StatusResu
 	}
 
 	for _, release := range releases {
-		if release.Name == d.DeploymentConfig.Name {
+		if d.matchesRelease(release) {
 			if release.Status != "DEPLOYED" {
 				return &deployer.StatusResult{
 					Name:   d.DeploymentConfig.Name,
@@ -83,3 +84,12 @@ func (d *DeployConfig) getDeployTarget() string {
 
 	return retString
 }
+func (d *DeployConfig) matchesRelease(release *types.Release) bool {
+	if d.DeploymentConfig.Name == release.Name {
+		return true
+	}
+	if d.DeploymentConfig.Helm != nil && d.DeploymentConfig.Helm.ReleaseName == release.Name {
+		return true
+	}
+	return false
+}

pkg/devspace/deploy/deployer/helm/status_test.go

@@ -30,6 +30,51 @@ type statusTestCase struct {
 
 func TestStatus(t *testing.T) {
 	testCases := []statusTestCase{
+		{
+			name:       "Deployment successful",
+			deployment: "deployed",
+			releases: []*helmtypes.Release{
+				{
+					Name:   "deployed",
+					Status: "DEPLOYED",
+				},
+			},
+			helmConfig: &latest.HelmConfig{
+				Chart: &latest.ChartConfig{
+					Name:    "chartName",
+					Version: "chartVersion",
+				},
+			},
+			expectedStatus: deployer.StatusResult{
+				Name:   "deployed",
+				Type:   "Helm",
+				Target: "chartName (chartVersion)",
+				Status: "Deployed",
+			},
+		},
+		{
+			name:       "helmReleaseName",
+			deployment: "deployment",
+			releases: []*helmtypes.Release{
+				{
+					Name:   "releaseName",
+					Status: "DEPLOYED",
+				},
+			},
+			helmConfig: &latest.HelmConfig{
+				ReleaseName: "releaseName",
+				Chart: &latest.ChartConfig{
+					Name:    "chartName",
+					Version: "chartVersion",
+				},
+			},
+			expectedStatus: deployer.StatusResult{
+				Name:   "deployment",
+				Type:   "Helm",
+				Target: "chartName (chartVersion)",
+				Status: "Deployed",
+			},
+		},
 		{
 			name:       "No releases",
 			deployment: "depl",