Merge branch 'main' into release-bot

akshatsinha007 · web-flow · commit adf2f61141bb · 2024-09-19T14:49:37.000+05:30
diff --git a/api/helm-app/service/HelmAppService.go b/api/helm-app/service/HelmAppService.go
@@ -1159,7 +1159,12 @@ func (impl *HelmAppServiceImpl) appListRespProtoTransformer(deployedApps *gRPC.D
 			}
 			// end
 			lastDeployed := deployedapp.LastDeployed.AsTime()
-			appDetails, appFetchErr := impl.appRepository.FindActiveByName(deployedapp.AppName)
+			appDetails, appFetchErr := impl.getAppForAppIdentifier(
+				&helmBean.AppIdentifier{
+					ClusterId:   int(deployedapp.EnvironmentDetail.ClusterId),
+					Namespace:   deployedapp.EnvironmentDetail.Namespace,
+					ReleaseName: deployedapp.AppName,
+				})
 			projectId := int32(0)
 			if appFetchErr == nil {
 				projectId = int32(appDetails.TeamId)
diff --git a/docs/reference/glossary.md b/docs/reference/glossary.md
@@ -10,6 +10,12 @@ An immutable blob of data generated as an output after the execution of a job, b
 
 * Once a job is complete, you can view the job artifacts by going to Jobs → Run history (tab) → (choose a pipeline and date of triggering the build) → Artifacts (tab).
 
+### ArgoCD Apps
+
+ArgoCD Apps are the micro-services deployed using a [GitOps](#gitops) deployment tool named [Argo CD](https://argo-cd.readthedocs.io/en/stable/). 
+
+If ArgoCD applications are present in your cluster, they will appear in the [ArgoCD Apps listing](../user-guide/applications.md#enabling-argocd-app-listing). 
+
 ### Base Deployment Template
 
 A deployment template is a manifest of the application defining its runtime behavior. You can select one of the default deployment charts or custom deployment charts created by super-admin.
@@ -112,6 +118,12 @@ Similarly, the CPU and memory resources can be different for each environment. T
 
 You can add external links related to the application. For e.g., you can add Prometheus, Grafana, and many more to your application by going to Global Configurations → External Links. [Read More...](../user-guide/global-configurations/external-links.md)
 
+### FluxCD Apps
+
+FluxCD Apps are the micro-services deployed using a [GitOps](#gitops) deployment tool named [Flux CD](https://fluxcd.io/). 
+
+If FluxCD applications are present in your cluster, they will appear in the [FluxCD Apps listing](../user-guide/applications.md#view-fluxcd-app-listing). 
+
 ### GitOps
 
 A methodology for managing and automating Kubernetes deployments using Git repositories as the source of truth. Changes to the desired state of the cluster are driven by Git commits. [Read More...](../user-guide/global-configurations/gitops.md)
diff --git a/docs/user-guide/applications.md b/docs/user-guide/applications.md
@@ -1,3 +1,145 @@
 # Applications
 
-Please configure Global Configurations before creating an application or cloning an existing application.
+{% hint style="warning" %}
+Configure [Global Configurations](./global-configurations/README.md) first before creating an application or cloning an existing application.
+{% endhint %}
+
+## Introduction
+
+The **Applications** page helps you create and manage your microservices, and it majorly consists of the following:
+
+* [Application Listing](#application-listing)
+* [Create Button](#create-button)
+* [Other Options](#other-options)
+
+### Application Listing
+
+You can view the app name, its status, environment, namespace, and many more upfront. The apps are segregated into: [Devtron Apps](../reference/glossary.md#devtron-apps), [Helm Apps](../reference/glossary.md#helm-apps), [ArgoCD Apps](../reference/glossary.md#argocd-apps), and [FluxCD Apps](../reference/glossary.md#fluxcd-apps).
+
+![Figure 1: App Types](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/creating-application/argocd/app-types.jpg)
+
+### Create Button
+
+You can use this to:
+* [Create a Devtron app](./create-application.md)
+* [Create a Helm app](./deploy-chart/deployment-of-charts.md)
+* [Create a Job](./jobs/create-job.md)
+
+### Other Options
+
+There are additional options available for you:
+* **Search and filters** to make it easier for you to find applications.
+* **Export CSV** to download the data of Devtron apps (not supported for Helm apps and Argo CD apps).
+* **Sync button** to refresh the app listing.
+
+---
+
+## View ArgoCD App Listing
+
+{% hint style="warning" %}
+### Who Can Perform This Action?
+Users need super-admin permission to view/enable/disable the ArgoCD listing.
+{% endhint %}
+
+### Preface
+
+In Argo CD, a user manages one dashboard for one ArgoCD instance. Therefore, with multiple ArgoCD instances, the process becomes cumbersome for the user to manage several dashboards.
+
+With Devtron, you get an entire Argo CD app listing in one place. This listing includes:
+* Apps deployed using [GitOps](../reference/glossary.md#gitops) on Devtron
+* Other Argo CD apps present in your cluster
+
+![Figure 2: ArgoCD App List](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/creating-application/argocd/app-details-argo.gif)
+
+### Advantages
+
+Devtron also bridges the gap for ArgoCD users by providing additional features as follows:
+
+* **Resource Scanning**: You can scan for vulnerabilities using Devtron's [resource scanning](../user-guide/security-features.md#from-app-details) feature. [![](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/elements/EnterpriseTag.svg)](https://devtron.ai/pricing)
+
+* **Single-pane View**: All Argo CD apps will show details such as their app status, environment, cluster, and namespace together in one dashboard. 
+
+* **Feature-rich Options**: Clicking an Argo CD app will give you access to its logs, terminal, events, manifest, available resource kinds, pod restart log, and many more.
+
+{% hint style="info" %}
+### Additional References
+[ArgoCD: Standalone Configuration vs Devtron Configuration](https://devtron.ai/blog/argocd-standalone-configuration-vs-devtron-configuration/#argocd-installation-and-configuration)
+{% endhint %}
+
+### Prerequisite
+The cluster in which Argo CD apps exist should be added in **Global Configurations** → **Clusters and Environments**
+
+### Feature Flag
+
+> **`ENABLE_EXTERNAL_ARGO_CD: "true"`**
+
+### Enabling ArgoCD App Listing
+
+{% embed url="https://www.youtube.com/watch?v=4KyYnsAEpqo" caption="Enabling External ArgoCD Listing" %}
+
+1. Go to the **Resource Browser** of Devtron.
+
+2. Select the cluster (in which your Argo CD app exists).
+
+3. Type `ConfigMap` in the 'Jump to Kind' field.
+
+4. Search for `dashboard-cm` using the available search bar and click it.
+
+5. Click **Edit Live Manifest**.
+
+6. Set the feature flag **ENABLE_EXTERNAL_ARGO_CD** to  **"true"**
+
+7. Click **Apply Changes**.
+
+8. Go back to the 'Jump to Kind' field and type `Pod`.
+
+9. Search for `dashboard` pod and use the kebab menu (3 vertical dots) to delete the pod.
+
+10. Go to **Applications** and refresh the page. A new tab named **ArgoCD Apps** will be visible.
+
+11. Select the cluster(s) from the dropdown to view the Argo CD apps available in the chosen cluster(s).
+
+    ![Figure 3: Cluster Selection for Argo CD Listing](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/creating-application/argocd/argo-cluster-selection.jpg)
+
+---
+
+## View FluxCD App Listing
+
+{% hint style="warning" %}
+### Who Can Perform This Action?
+Users need super-admin permission to view/enable/disable the FluxCD listing.
+{% endhint %}
+
+### Preface
+
+Flux CD doesn't have any official dashboard; however, Devtron supports the listing of your [Flux CD](https://fluxcd.io/) apps in one dashboard. Here, the [advantages](#advantages) are same as those of [ArgoCD app listing](#view-argocd-app-listing).
+
+![Figure 4: FluxCD App List and Details](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/creating-application/fluxcd/fluxcd-listing.jpg)
+
+### Prerequisite
+The cluster in which Flux CD apps exist should be added in **Global Configurations** → **Clusters and Environments**
+
+### Feature Flag
+
+> **`FEATURE_EXTERNAL_FLUX_CD_ENABLE: "true"`**
+
+### Enabling FluxCD App Listing
+
+{% hint style="info" %}
+### Tip
+You may refer the steps mentioned in the [Enabling ArgoCD App Listing](#enabling-argocd-app-listing) section since the procedure is similar. 
+{% endhint %}
+
+Using Devtron's Resource Browser, add the [feature flag](#feature-flag-1) in the Dashboard ConfigMap as shown below.
+
+![Figure 5: Editing Dashboard ConfigMap](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/creating-application/fluxcd/flux-feature-flag.jpg)
+
+After successfully executing all the steps, a new tab named **FluxCD Apps** will be visible. Select the cluster(s) from the dropdown to view the Flux CD apps available in the chosen cluster(s).
+
+![Figure 6: Selecting Cluster](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/creating-application/fluxcd/cluster-selection.jpg)
+
+(Optional) Once you choose cluster(s), you may use the **Template Type** dropdown to further filter your Flux CD app listing based on its type, i.e., [Kustomization](https://fluxcd.io/flux/components/kustomize/kustomizations/) or [Helmrelease](https://fluxcd.io/flux/components/helm/helmreleases/).
+
+Click any Flux CD app to view its details as shown below.
+
+![Figure 7: Flux App Details](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/creating-application/fluxcd/app-details-flux.gif)
diff --git a/docs/user-guide/global-configurations/filter-condition.md b/docs/user-guide/global-configurations/filter-condition.md
@@ -8,6 +8,7 @@ Using filter conditions, you can control the progression of events. Here are a f
 * Images containing the label "test" should not be eligible for deployment in production environment
 * Only images having tag versions greater than v0.7.4 should be eligible for deployment
 * Images hosted on Docker Hub should be eligible but not the rest
+* Only images derived from master branch should be eligible for production deployment (see [example](#scenario-2))
 
 ---
 
@@ -55,17 +56,17 @@ You must have application(s) with CI-CD workflow(s) configured
 
     ![Figure 5: Selecting Environment(s) from Cluster(s)](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/global-configurations/filters/environment-selection.jpg)
 
-    {% hint style="info" %}
-    Since an application can have more than one environment, the filter conditions apply only to the environment you chose in the **Apply to** section. If you create a filter condition without choosing an application or environment, it will not apply to any of your pipelines.
-    {% endhint %}
+{% hint style="info" %}
+Since an application can have more than one environment, the filter conditions apply only to the environment you chose in the **Apply to** section. If you create a filter condition without choosing an application or environment, it will not apply to any of your pipelines.
+{% endhint %}
 
 6. Click **Save**. You have successfully created a filter.
 
     ![Figure 6: Success Toast](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/global-configurations/filters/filter-created.jpg)
 
-    {% hint style="warning" %}
-    If you create filters using CEL expressions that result in a conflict (i.e., passing and failing of the same image), fail will have higher precedence
-    {% endhint %}
+{% hint style="warning" %}
+If you create filters using CEL expressions that result in a conflict (i.e., passing and failing of the same image), fail will have higher precedence
+{% endhint %}
 
 ---
 
@@ -78,6 +79,8 @@ Here's a sample pipeline we will be using for our explanation of [pass condition
 
 ### Pass Condition
 
+#### Scenario 1
+
 Consider a scenario where you wish to make an image eligible for deployment only if its tag version is greater than `v0.0.7`
 
 The CEL Expression should be `containerImageTag > "v0.0.7"`
@@ -102,6 +105,25 @@ Clicking the filter icon at the top-left shows the filter condition(s) applied t
 
 ![Figure 12b: Conditions Applied](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/global-configurations/filters/conditions-applied-1.jpg)
 
+#### Scenario 2
+
+Consider another scenario where you wish to make images eligible for deployment only if the application's git branch starts with the word `hotfix` and also if its repo URL matches your specified condition.
+
+**CEL Expression**:
+
+`gitCommitDetails.filter(gitCommitDetail, gitCommitDetail.startsWith('https://github.com/devtron-labs')).map(repo, gitCommitDetails[repo].branch).exists_one(branch, branch.startsWith('hotfix-'))`
+
+where, `https://github.com/devtron-labs` is a portion of the repo URL <br />
+and `hotfix-` is for finding the branch name (say *hotfix-sept-2024*)
+
+Alternatively, if you have a fixed branch (say *hotfix-123*), you may write the following expression:
+
+`'hotfix-123' in gitCommitDetails.filter(gitCommitDetail, gitCommitDetail.startsWith('https://github.com/devtron-labs')).map(repo, gitCommitDetails[repo].branch)`
+
+**Walkthrough Video**:
+
+{% embed url="https://www.youtube.com/watch?v=R8IbZhXhH-k" caption="Filter Condition Example" %}
+
 
 ### Fail Condition
 
diff --git a/internal/sql/repository/app/AppRepository.go b/internal/sql/repository/app/AppRepository.go
@@ -40,6 +40,10 @@ type App struct {
 	sql.AuditLog
 }
 
+const (
+	SYSTEM_USER_ID = 1
+)
+
 func (r *App) IsAppJobOrExternalType() bool {
 	return len(r.DisplayName) > 0
 }
@@ -129,16 +133,37 @@ func (repo AppRepositoryImpl) SetDescription(id int, description string, userId
 }
 
 func (repo AppRepositoryImpl) FindActiveByName(appName string) (*App, error) {
-	pipelineGroup := &App{}
+	var apps []*App
 	err := repo.dbConnection.
-		Model(pipelineGroup).
+		Model(&apps).
 		Where("app_name = ?", appName).
 		Where("active = ?", true).
-		Order("id DESC").Limit(1).
+		Order("id DESC").
 		Select()
-	// there is only single active app will be present in db with a same name.
-	return pipelineGroup, err
+	if len(apps) == 1 {
+		return apps[0], nil
+	} else if len(apps) > 1 {
+		isHelmApp := true
+		for _, app := range apps {
+			if app.AppType != helper.ChartStoreApp && app.AppType != helper.ExternalChartStoreApp {
+				isHelmApp = false
+				break
+			}
+		}
+		if isHelmApp {
+			err := repo.fixMultipleHelmAppsWithSameName(appName)
+			if err != nil {
+				repo.logger.Errorw("error in fixing duplicate helm apps with same name")
+				return nil, err
+			}
+		}
+		return apps[0], nil
+	} else {
+		err = pg.ErrNoRows
+	}
+	return nil, err
 }
+
 func (repo AppRepositoryImpl) FindAppIdByName(appName string) (int, error) {
 	app := &App{}
 	err := repo.dbConnection.
@@ -324,9 +349,52 @@ func (repo AppRepositoryImpl) FindAppAndProjectByAppName(appName string) (*App,
 		Where("app.app_name = ?", appName).
 		Where("app.active=?", true).
 		Select()
+
+	if err == pg.ErrMultiRows && (app.AppType == helper.ChartStoreApp || app.AppType == helper.ExternalChartStoreApp) {
+		// this case can arise in helms apps only
+
+		err := repo.fixMultipleHelmAppsWithSameName(appName)
+		if err != nil {
+			repo.logger.Errorw("error in fixing duplicate helm apps with same name")
+			return nil, err
+		}
+
+		err = repo.dbConnection.Model(app).Column("Team").
+			Where("app.app_name = ?", appName).
+			Where("app.active=?", true).
+			Select()
+		if err != nil {
+			repo.logger.Errorw("error in fetching apps by name", "appName", appName, "err", err)
+			return nil, err
+		}
+	}
 	return app, err
 }
 
+func (repo AppRepositoryImpl) fixMultipleHelmAppsWithSameName(appName string) error {
+	// updating installed apps setting app_id = max app_id
+	installAppUpdateQuery := `update installed_apps set 
+                          app_id=(select max(id) as id from app where app_name = ?) 
+                    	where app_id in (select id from app where app_name= ? )`
+
+	_, err := repo.dbConnection.Exec(installAppUpdateQuery, appName, appName)
+	if err != nil {
+		repo.logger.Errorw("error in updating maxAppId in installedApps", "appName", appName, "err", err)
+		return err
+	}
+
+	maxAppIdQuery := repo.dbConnection.Model((*App)(nil)).ColumnExpr("max(id)").
+		Where("app_name = ? ", appName).
+		Where("active = ? ", true)
+
+	// deleting all apps other than app with max id
+	_, err = repo.dbConnection.Model((*App)(nil)).
+		Set("active = ?", false).Set("updated_by = ?", SYSTEM_USER_ID).Set("updated_on = ?", time.Now()).
+		Where("id not in (?) ", maxAppIdQuery).Update()
+
+	return nil
+}
+
 func (repo AppRepositoryImpl) FindAllMatchesByAppName(appName string, appType helper.AppType) ([]*App, error) {
 	var apps []*App
 	var err error
diff --git a/pkg/app/AppCrudOperationService.go b/pkg/app/AppCrudOperationService.go
diff --git a/pkg/appStore/installedApp/service/EAMode/InstalledAppDBService.go b/pkg/appStore/installedApp/service/EAMode/InstalledAppDBService.go
