Merge branch 'develop' into feature-release-v7

.gitbook.yaml

@@ -16,7 +16,7 @@ redirects:
     setup/upgrade/devtron-upgrade-0.2.x-0.3.x: getting-started/upgrade/devtron-upgrade-0.2.x-0.3.x
     setup/global-configurations: user-guide/global-configurations/README.md
     setup/global-configurations/gitops: user-guide/global-configurations/gitops.md
-    setup/global-configurations/custom-charts: user-guide/global-configurations/custom-charts.md
+    setup/global-configurations/custom-charts: user-guide/global-configurations/deployment-charts.md
     setup/global-configurations/user-access: user-guide/global-configurations/authorization/user-access.md 
     setup/global-configurations/external-links: user-guide/global-configurations/external-links.md
     setup/global-configurations/projects: user-guide/global-configurations/projects.md
@@ -109,7 +109,7 @@ redirects:
     getting-started/global-configurations/filter-condition: user-guide/global-configurations/filter-condition.md
     getting-started/global-configurations/build-infra: user-guide/global-configurations/build-infra.md
     getting-started/global-configurations/gitops: user-guide/global-configurations/gitops.md
-    getting-started/global-configurations/custom-charts: user-guide/global-configurations/custom-charts.md
+    getting-started/global-configurations/custom-charts: user-guide/global-configurations/deployment-charts.md
     getting-started/global-configurations/external-links: user-guide/global-configurations/external-links.md
     getting-started/global-configurations/projects: user-guide/global-configurations/projects.md
     getting-started/global-configurations/manage-notification: user-guide/global-configurations/manage-notification.md
@@ -127,4 +127,5 @@ redirects:
     user-guide/clusters: user-guide/resource-browser.md
     usage/clusters: user-guide/resource-browser.md
     global-configurations/authorization/sso-login/okta: user-guide/global-configurations/authorization/sso/okta.md
-    usage/applications/creating-application/ci-pipeline/ci-build-pre-post-plugins: user-guide/creating-application/workflow/ci-build-pre-post-plugins.md
+    usage/applications/creating-application/ci-pipeline/ci-build-pre-post-plugins: user-guide/creating-application/workflow/ci-build-pre-post-plugins.md
+    global-configurations/custom-charts: user-guide/global-configurations/deployment-charts.md

api/restHandler/DeploymentConfigurationRestHandler.go

@@ -115,9 +115,11 @@ func (handler *DeploymentConfigurationRestHandlerImpl) enforceForAppAndEnv(appNa
 		return false
 	}
 
-	object = handler.enforcerUtil.GetEnvRBACNameByAppAndEnvName(appName, envName)
-	if ok := handler.enforcer.Enforce(token, casbin.ResourceEnvironment, action, object); !ok {
-		return false
+	if len(envName) > 0 {
+		object = handler.enforcerUtil.GetEnvRBACNameByAppAndEnvName(appName, envName)
+		if ok := handler.enforcer.Enforce(token, casbin.ResourceEnvironment, action, object); !ok {
+			return false
+		}
 	}
 	return true
 }

api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go

@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
 	"golang.org/x/exp/maps"
 	"io"
 	"net/http"
@@ -496,19 +495,13 @@ func (handler *PipelineConfigRestHandlerImpl) getCdPipelinesForCIPatchRbac(patch
 	// find the workflow in which we are patching and use the workflow id to fetch all the workflow mappings using the workflow.
 	// get cd pipeline ids from those workflows and fetch the cd pipelines.
 
-	// get the ciPipeline
-	switchFromPipelineId, switchFromType := patchRequest.SwitchSourceInfo()
-
-	// in app workflow mapping all the build source types are 'CI_PIPELINE' type, except external -> WEBHOOK.
-	componentType := appWorkflow.CIPIPELINE
-	if switchFromType == CiPipeline.EXTERNAL {
-		componentType = appWorkflow.WEBHOOK
-	}
+	// get the ciPipeline patch source info
+	componentId, componentType := patchRequest.PatchSourceInfo()
 
 	// the appWorkflowId can be taken from patchRequest.AppWorkflowId but doing this can make 2 sources of truth to find the workflow
-	sourceAppWorkflowMapping, err := handler.appWorkflowService.FindWFMappingByComponent(componentType, switchFromPipelineId)
+	sourceAppWorkflowMapping, err := handler.appWorkflowService.FindWFMappingByComponent(componentType, componentId)
 	if err != nil {
-		handler.Logger.Errorw("error in finding the appWorkflowMapping using componentId and componentType", "componentType", componentType, "componentId", switchFromPipelineId, "err", err)
+		handler.Logger.Errorw("error in finding the appWorkflowMapping using componentId and componentType", "componentType", componentType, "componentId", componentId, "err", err)
 		return nil, err
 	}
 

devtron-images.txt.source

@@ -0,0 +1,39 @@
+quay.io/devtron/image-scanner:137872c2-141-23848
+quay.io/devtron/inception:473deaa4-185-21582
+quay.io/devtron/hyperion:291c4c75-280-23860
+public.ecr.aws/docker/library/redis:7.0.5-alpine
+quay.io/argoproj/argocd:v2.5.2
+quay.io/argoproj/workflow-controller:v3.4.3
+quay.io/devtron/authenticator:e414faff-393-13273
+quay.io/devtron/bats:v1.4.1
+quay.io/devtron/busybox:1.31.1
+quay.io/devtron/chart-sync:5a1d0301-150-23845
+quay.io/devtron/curl:7.73.0
+quay.io/devtron/dashboard:5f95d187-690-23841
+quay.io/devtron/devtron-utils:dup-chart-repo-v1.1.0
+quay.io/devtron/devtron:291c4c75-434-23853
+quay.io/devtron/ci-runner:48aca9f4-138-23844
+quay.io/devtron/dex:v2.30.2
+quay.io/devtron/git-sensor:86e13283-200-23847
+quay.io/devtron/grafana:7.3.1
+quay.io/devtron/k8s-sidecar:1.1.0
+quay.io/devtron/k8s-utils:tutum-curl
+quay.io/devtron/kubectl:latest
+quay.io/devtron/kubelink:0dee6306-564-23843
+quay.io/devtron/kubewatch:850b40d5-419-23840
+quay.io/devtron/lens:56211042-333-23839
+quay.io/devtron/migrator:v4.16.2
+quay.io/devtron/nats-box
+quay.io/devtron/nats-server-config-reloader:0.6.2
+quay.io/devtron/nats:2.9.3-alpine
+quay.io/devtron/notifier:9639b1ab-372-23850
+quay.io/devtron/postgres:11.9
+quay.io/devtron/postgres_exporter:v0.10.1
+quay.io/devtron/prometheus-nats-exporter:0.9.0
+quay.io/devtron/minio:RELEASE.2021-02-14T04-01-33Z
+quay.io/devtron/clair:4.3.6
+quay.io/devtron/postgres:11.9.0-debian-10-r26
+quay.io/devtron/postgres_exporter:v0.4.7
+quay.io/devtron/minio-mc:RELEASE.2021-02-14T04-28-06Z
+quay.io/devtron/minideb:latest
+

docs/SUMMARY.md

@@ -7,6 +7,7 @@
   * [Install Devtron with CI/CD and GitOps (Argo CD)](setup/install/install-devtron-with-cicd-with-gitops.md)
   * [Install Devtron without Integrations](setup/install/install-devtron.md)
   * [Install Devtron on Minikube, Microk8s, K3s, Kind, Cloud VMs](setup/install/Install-devtron-on-Minikube-Microk8s-K3s-Kind.md)
+  * [Install Devtron on Airgapped Environment](setup/install/install-devtron-in-airgapped-environment.md)
   * [Demo on Popular Cloud Providers](setup/install/demo-tutorials.md)
   * [Backup for Disaster Recovery](setup/install/devtron-backup.md)
   * [Uninstall Devtron](setup/install/uninstall-devtron.md)
@@ -24,7 +25,7 @@
   * [Git Accounts](user-guide/global-configurations/git-accounts.md)
   * [Container/OCI Registry](user-guide/global-configurations/container-registries.md)
   * [Chart Repositories](user-guide/global-configurations/chart-repo.md)
-  * [Custom Charts](user-guide/global-configurations/custom-charts.md)
+  * [Deployment Charts](user-guide/global-configurations/deployment-charts.md)
   * [Authorization](user-guide/global-configurations/authorization/README.md)
     * [SSO Login Services](user-guide/global-configurations/sso-login.md)
       * [Google](user-guide/global-configurations/authorization/sso/google.md)
@@ -135,9 +136,14 @@
     * [Code-Scan](user-guide/plugins/code-scan.md)
     * [Copacetic](user-guide/plugins/copacetic.md)
     * [Copy Container Image](user-guide/plugins/copy-container-image.md)
+    * [Cosign](user-guide/plugins/cosign.md)
+    * [CraneCopy](user-guide/plugins/crane-copy.md)
     * [Dependency track - Maven & Gradle](user-guide/plugins/dependency-track-maven-gradle.md)
     * [Dependency track - NodeJS](user-guide/plugins/dependency-track-nodejs.md)
     * [Dependency track - Python](user-guide/plugins/dependency-track-python.md)
+    * [Devtron CD Trigger](user-guide/plugins/devtron-cd-trigger.md)
+    * [Devtron Job Trigger](user-guide/plugins/devtron-job-trigger.md)
+    * [DockerSlim](user-guide/plugins/docker-slim.md)
     * [GoLang-migrate](user-guide/plugins/golang-migrate.md)
     * [Jenkins](user-guide/plugins/jenkins.md)
     * [K6 Load Testing](user-guide/plugins/k6-load-testing.md)
@@ -159,4 +165,4 @@
   * [Pull Helm Charts from OCI Registry](user-guide/use-cases/oci-pull.md)
 * [Telemetry Overview](user-guide/telemetry.md)
 * [Devtron on Graviton](reference/graviton.md)
-* [Release Notes](https://github.com/devtron-labs/devtron/releases)
+* [Release Notes](https://github.com/devtron-labs/devtron/releases)

docs/reference/glossary.md

@@ -64,9 +64,9 @@ Temporarily marking a node as unschedulable, preventing new pods from being assi
 
 CronJob is used to create Jobs on a repeating schedule. It is commonly used for running periodic tasks with no manual intervention. In Devtron, you can view a list of cronjobs by going to Resource Browser → (choose a cluster) → Workloads → CronJob. [Read More...](../user-guide/creating-application/deployment-template/job-and-cronjob.md#2.-cronjob)
 
-### Custom Charts
+### Deployment Charts
 
-Devtron offers a variety of ready-made Helm charts for common tasks and functions. If you have a specific need that isn't met by these preconfigured charts, super-admins have the permission to upload their own custom charts. Once uploaded, these custom charts become accessible for use by all users on the Devtron platform. [Read More...](../user-guide/global-configurations/custom-charts.md)
+Devtron offers a variety of ready-made Helm charts for common tasks and functions. If you have a specific need that isn't met by these preconfigured charts, super-admins have the permission to upload their own charts. Once uploaded, these charts become accessible for use by all users on the Devtron platform. [Read More...](../user-guide/global-configurations/deployment-charts.md)
 
 ### DaemonSet