diff --git a/pkg/appStore/installedApp/repository/InstalledAppRepository.go b/pkg/appStore/installedApp/repository/InstalledAppRepository.go index 57d0a3f9ae..1ce29f75aa 100644 --- a/pkg/appStore/installedApp/repository/InstalledAppRepository.go +++ b/pkg/appStore/installedApp/repository/InstalledAppRepository.go @@ -18,6 +18,9 @@ package repository import ( "fmt" + "strconv" + "time" + "github.com/devtron-labs/common-lib/utils/k8s/health" "github.com/devtron-labs/devtron/internal/sql/repository/app" "github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/timelineStatus" @@ -34,8 +37,6 @@ import ( "github.com/go-pg/pg" "github.com/go-pg/pg/orm" "go.uber.org/zap" - "strconv" - "time" ) // InstalledApps TODO: remove the deprecated column GitOpsRepoName @@ -765,7 +766,7 @@ func (impl *InstalledAppRepositoryImpl) GetAppAndEnvDetailsForDeploymentAppTypeI var installedApps []*InstalledApps err := impl.dbConnection. Model(&installedApps). - Column("installed_apps.id", "App.app_name", "App.display_name", "Environment.cluster_id", "Environment.namespace"). + Column("installed_apps.id", "App.app_name", "App.display_name", "Environment.cluster_id", "Environment.namespace", "Environment.environment_name"). Join("LEFT JOIN deployment_config dc on dc.active=true and dc.app_id = installed_apps.app_id and dc.environment_id=installed_apps.environment_id"). Where("environment.cluster_id in (?)", pg.In(clusterIds)). Where("(installed_apps.deployment_app_type = ? or dc.deployment_app_type = ?)", deploymentAppType, deploymentAppType). diff --git a/pkg/fluxApplication/FluxApplicationService.go b/pkg/fluxApplication/FluxApplicationService.go index 779b5b2c63..2bd388d3cc 100644 --- a/pkg/fluxApplication/FluxApplicationService.go +++ b/pkg/fluxApplication/FluxApplicationService.go @@ -3,6 +3,9 @@ package fluxApplication import ( "context" "fmt" + "io" + "net/http" + "github.com/devtron-labs/common-lib/utils/k8s/commonBean" "github.com/devtron-labs/devtron/api/connector" "github.com/devtron-labs/devtron/api/helm-app/gRPC" @@ -15,12 +18,11 @@ import ( "github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository" "github.com/devtron-labs/devtron/pkg/cluster" "github.com/devtron-labs/devtron/pkg/fluxApplication/bean" + util2 "github.com/devtron-labs/devtron/util" "github.com/devtron-labs/devtron/util/sliceUtil" "github.com/gogo/protobuf/proto" "go.opentelemetry.io/otel" "go.uber.org/zap" - "io" - "net/http" ) type FluxApplicationService interface { @@ -126,7 +128,7 @@ func (impl *FluxApplicationServiceImpl) ListFluxApplications(ctx context.Context if _, ok := installedAppMap[key]; !ok { installedAppMap[key] = make(map[string]bool) } - deploymentAppName := fmt.Sprintf("%s-%s", i.App.AppName, i.Environment.Namespace) + deploymentAppName := util2.BuildDeployedAppName(i.App.AppName, i.Environment.Name) installedAppMap[key][deploymentAppName] = true } if !noStream {