fix: populating HelmListClusterMap with appName-namespace as key instead of only appName to handle multiple app with same name in diff namespace

pkg/k8sInformer/K8sInformer.go

@@ -46,7 +46,7 @@ type K8sInformer interface {
 	stopInformer(clusterName string, clusterId int)
 	startInformerAndPopulateCache(clusterId int) error
 	GetAllReleaseByClusterId(clusterId int) []*client.DeployedAppDetail
-	CheckReleaseExists(clusterId int32, releaseName string) bool
+	CheckReleaseExists(clusterId int32, releaseIdentifier string) bool
 	GetClusterClientSet(clusterInfo bean.ClusterInfo) (*kubernetes.Clientset, error)
 	RegisterListener(listener ClusterSecretUpdateListener)
 }
@@ -418,7 +418,7 @@ func (impl *K8sInformerImpl) startInformerAndPopulateCache(clusterId int) error
 				}
 				impl.mutex.Lock()
 				defer impl.mutex.Unlock()
-				impl.HelmListClusterMap[clusterId][releaseDTO.Name+string(rune(clusterModel.Id))] = appDetail
+				impl.HelmListClusterMap[clusterId][impl.getUniqueReleaseKey(&ReleaseDto{releaseDTO}, clusterModel.Id)] = appDetail
 			}
 		},
 		UpdateFunc: func(oldObj, newObj interface{}) {
@@ -445,8 +445,8 @@ func (impl *K8sInformerImpl) startInformerAndPopulateCache(clusterId int) error
 				}
 				impl.mutex.Lock()
 				defer impl.mutex.Unlock()
-				// adding cluster id with release name because there can be case when two cluster have release with same name
-				impl.HelmListClusterMap[clusterId][releaseDTO.Name+string(rune(clusterModel.Id))] = appDetail
+				// adding cluster id with release name and namespace because there can be case when two cluster or two namespaces have release with same name
+				impl.HelmListClusterMap[clusterId][impl.getUniqueReleaseKey(&ReleaseDto{releaseDTO}, clusterModel.Id)] = appDetail
 			}
 		},
 		DeleteFunc: func(obj interface{}) {
@@ -461,7 +461,7 @@ func (impl *K8sInformerImpl) startInformerAndPopulateCache(clusterId int) error
 				}
 				impl.mutex.Lock()
 				defer impl.mutex.Unlock()
-				delete(impl.HelmListClusterMap[clusterId], releaseDTO.Name+string(rune(clusterModel.Id)))
+				delete(impl.HelmListClusterMap[clusterId], impl.getUniqueReleaseKey(&ReleaseDto{releaseDTO}, clusterModel.Id))
 			}
 		},
 	})
@@ -471,6 +471,10 @@ func (impl *K8sInformerImpl) startInformerAndPopulateCache(clusterId int) error
 	return nil
 }
 
+func (impl *K8sInformerImpl) getUniqueReleaseKey(release *ReleaseDto, clusterId int) string {
+	return release.getUniqueReleaseIdentifier() + "_" + strconv.Itoa(clusterId)
+}
+
 func (impl *K8sInformerImpl) GetAllReleaseByClusterId(clusterId int) []*client.DeployedAppDetail {
 
 	var deployedAppDetailList []*client.DeployedAppDetail
@@ -481,9 +485,9 @@ func (impl *K8sInformerImpl) GetAllReleaseByClusterId(clusterId int) []*client.D
 	return deployedAppDetailList
 }
 
-func (impl *K8sInformerImpl) CheckReleaseExists(clusterId int32, releaseName string) bool {
+func (impl *K8sInformerImpl) CheckReleaseExists(clusterId int32, releaseIdentifier string) bool {
 	releaseMap := impl.HelmListClusterMap[int(clusterId)]
-	_, ok := releaseMap[releaseName]
+	_, ok := releaseMap[releaseIdentifier]
 	if ok {
 		return true
 	}

pkg/k8sInformer/constants.go

@@ -0,0 +1,11 @@
+package k8sInformer
+
+import "helm.sh/helm/v3/pkg/release"
+
+type ReleaseDto struct {
+	*release.Release
+}
+
+func (r *ReleaseDto) getUniqueReleaseIdentifier() string {
+	return r.Namespace + "_" + r.Name
+}

pkg/service/HelmAppService.go

@@ -818,7 +818,7 @@ func (impl HelmAppServiceImpl) installRelease(ctx context.Context, request *clie
 				InstallAppVersionHistoryId: int(request.InstallAppVersionHistoryId),
 			}
 			// Checking release exist because there can be case when release already exist with same name
-			releaseExist := impl.K8sInformer.CheckReleaseExists(releaseIdentifier.ClusterConfig.ClusterId, releaseIdentifier.ReleaseName)
+			releaseExist := impl.K8sInformer.CheckReleaseExists(releaseIdentifier.ClusterConfig.ClusterId, getUniqueReleaseIdentifierName(releaseIdentifier))
 			if releaseExist {
 				// release with name already exist, will not continue with release
 				helmInstallMessage.ErrorInInstallation = true

pkg/service/utils.go

@@ -0,0 +1,10 @@
+package service
+
+import (
+	client "github.com/devtron-labs/kubelink/grpc"
+	"strconv"
+)
+
+func getUniqueReleaseIdentifierName(releaseIdentifier *client.ReleaseIdentifier) string {
+	return releaseIdentifier.ReleaseNamespace + "_" + releaseIdentifier.ReleaseName + "_" + strconv.Itoa(int(releaseIdentifier.ClusterConfig.ClusterId))
+}