main sync to develop

.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

.github/CODEOWNERS

@@ -1,10 +1,6 @@
 #ALL
 * @vikramdevtron @kripanshdevtron @nishant-d @prakarsh-dt
 
-#DOCS
-docs/ @ashokdevtron @uxarya-d @prakarsh-dt
-.gitbook.yaml @uxarya-d @prakarsh-dt
-
 #Helm Charts
 charts/devtron/ @prakarsh-dt @pawan-mehta-dt @nishant-d
 scripts/devtron-reference-helm-charts @prakarsh-dt @pawan-mehta-dt @nishant-d

.github/workflows/update-release-notes.yml

@@ -7,6 +7,7 @@ on:
       - closed
     branches:
       - main
+      - develop
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

CHANGELOG/release-notes-v0.7.2.md

@@ -0,0 +1,127 @@
+## v0.7.2
+
+## Bugs
+- fix: error in enable change ci  (#5358)
+- fix: ci patch rbac fixes (#5461)
+- fix: bitbucket commit race condition for concurrent requests (#5505)
+- fix: handle nil check image scanning (#5497)
+- fix: error in switching ci to external ci (#5500)
+- fix: autoscale error handling (#5481)
+- fix: ci material update fixes for linked ci pipelines (#5523)
+- fix: Unable to get HPA manifest for no-gitops deployment (#5522)
+- fix: Deployment stuck in starting for no-gitops based pipelines (#5526)
+- fix: panic handling for deleted app in app group and env group filters (#5541)
+- fix: security time fix when scanning is passed (#5549)
+- fix: app group query optimisations (#5558)
+- fix: version and fixed_version in image scan result table (#5552)
+- fix: add if not exists in migration script for avoiding any errors while rerunning scripts (#5579)
+- fix: Resource Browser Shortnames are not applying dynamically (#5573)
+- fix: tls enabled flag not getting passed (#5609)
+- fix: reverting acd token fetch logic (#5614)
+- fix: query optimisations for app group cd listing and ci pipeline blockage state (#5641)
+- fix: dependabot security updates (#5608)
+- fix: default PipelineType given (#5668)
+- fix: validation in CiJob for external Artifact (#5669)
+- fix: Nats Panic Error in Orchestrator  (#5670)
+- fix: SSH & Proxy Cluster flows broken (#5675)
+- fix: Restart in orchestrator just after release (#5671)
+- fix: Sql query optimisation for application group app status listing (#5672)
+- fix: handling for HPA (autoscaling) (#5666)
+- fix: refrain from checkin autoscalingCheckBeforeTrigger for virt clus (#5696)
+- fix: Decode secret fix on add update oss (#5695)
+- fix: saving pco concurrency case handled (#5688)
+- fix: script for pipelineStageStepVariable, making input value and default_value text from varchar255 (#5701)
+- fix: Issue in EA Mode Cluster - error: pg: multiple rows in result set. (#5708)
+- fix: SkipCiBuildCachePushPull code incorporated with minor refac in handle runtime params validation (#5712)
+- fix: migration syn (#5718)
+- fix: ci patch rbac for branch update (#5759)
+- fix: Bitnami chart repo tls issue (#5740)
+- fix: check rbac on env if envName is present (#5765)
+- fix: scan tool active check removed (#5771)
+- fix: panic handlings and argocd app delete stuck in partial stage (#5770)
+- fix: unimplemented cluster cron service (#5781)
+- fix: sql injection fixes (#5783)
+- fix: sql injection fixes (#5801)
+- fix: upgraded to /argo-cd/v2 v2.9.21 (#5758)
+- fix: Ea rbac issues and not working on airgapped (#5813)
+- fix: scan list in global security page sql injection fix (#5808)
+- fix: app details page breaking (#5823)
+- fix: plugin ip variables value getting changed (#5844)
+- fix: ignore kubelink errors in server startup (#5852) (#5854)
+- fix: user rbac flows (#5804)
+- fix: pg multiple rows in EA mode (#5869)
+- fix: app overview panic for helm app (#5863)
+- fix: app detail page breaking (#5873)
+- fix: copy container image plugin issue (#5876)
+- fix: create GitOps configuration issue (#5883)
+## Enhancements
+- feat: support for handling hibernation and un-hibernation for keda enabled (#5431)
+- feat: Async ArgoCd App refresh operation (#5448)
+- feat: deployment config migration (#5368)
+- feat: Skipping falg based CMCS for Ci Job  (#5536)
+- feat: expose git commit data as env vars for ci stage (#5534)
+- feat: Defining applications as part of release track (#5489)
+- feat: gitlab webhook support (#5420)
+- feat: Enhance the buildx to use cache for multi arch builds (#5307)
+- feat: bug fix for picking wrong values in docker arguments (#5565)
+- feat: enable external argocd listing (#5585)
+- feat: plugin versioning feature (#5352)
+- feat: service account in chart sync (#5584)
+- feat: panic in sync pod cron and terminal not opening fix (#5603)
+- feat: tls support for git and gitops (#5305)
+- feat: system network controller sql script (#5637)
+- feat: skip argowf logs from ci logs (#5646)
+- feat: gitops support for oci repositories (#5577)
+- feat: ext argo app rbac and missing common features and flux app listing and details with rbac (#5528)
+- feat: expose git ops metrics (#5582)
+- feat: Generate config and secret hash for application mounting external k8s secrets (#5626)
+- feat: Env description handling (#5744)
+- feat: Added basic auth support for servicemonitor (#5761)
+- feat: Docker pull env driven (#5767)
+- feat: plugin creation support (#5630)
+- feat: Added multiple features support in servicemonitor (#5789)
+## Documentation
+- doc: Added FAQ no. 28 + GoLang-migrate Link + Code Block Fix (#5502)
+- docs: Drafted Software Distribution Hub (#5459)
+- doc: Created Image Label + Comments Doc (#5314)
+- doc: FAQ added for Bitnami Charts (#5545)
+- doc: Added Keycloak SSO Doc (#5571)
+- doc: Code scan plugin docs (#5562)
+- docs: jenkins-plugin (#5542)
+- doc: Copacetic plugin docs (#5564)
+- doc: Pull images from container repository (#5563)
+- doc: Collated Doc Fixes for July (#5591)
+- doc: Drafted Schema Driven DT (#5533)
+- doc: fixes in Copacetic plugin doc (#5622)
+- doc: Edit Deployment Chart Schema (#5735)
+- doc: Redirection of old entry in gitbook.yaml (#5738)
+- docs: added Documentation for Air-Gapped Installation (#5360)
+- doc: Update prerequisites of code-scan (#5625)
+- doc: Cosign plugin doc (#5665)
+- doc: CraneCopy plugin doc (#5658)
+- doc: Devtron CD Trigger Plugin doc (#5747)
+- doc: DockerSlim plugin doc (#5660)
+- doc: Devtron Job Trigger Plugin doc (#5742)
+- doc: Vulnerability Scanning Plugin doc (#5722)
+- docs: Jira plugins doc (Validator + Updater) (#5709)
+- docs: added commands enable ingress during helm installation (#5794)
+- doc: Revamped + Restructured Ingress Setup Doc (#5798)
+- docs: modifying route in ingress doc (#5799)
+- docs: modified the anchorlink in ingress.md (#5800)
+- doc: ArgoCD + FluxCD App Listing (#5636)
+- doc: Added Special CEL Expr in Filter Condition doc (#5850)
+## Others
+- misc: removal of azure-devops-issue-sync.yml (#5592)
+- misc: added action for discrod webhook (#5615)
+- misc: Revert "misc: added action for discrod webhook" (#5619)
+- chore: Plugin script fix oss (#5661)
+- misc: Release candidate v0.16.0 (#5687)
+- chore: migration number changes (#5692)
+- chore: ea fixes for helm app (#5713)
+- misc: Main sync rc - branch update (#5753)
+- chore: Revert "feat: plugin creation support" (#5778)
+- chore: cron status update refactoring (#5790)
+- misc: sync with common-lib changes with release candidate 18 (#5830)
+- chore: Custom tag for copy container image plugin (#5760) (#5841)
+- chore: migration number fix (#5840)
+- misc: Update CODEOWNERS (#5885)

Dockerfile

@@ -17,7 +17,8 @@ RUN apt clean autoclean
 RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/devtron .
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/auth_model.conf .
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
+#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
+COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/argocd-assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin

DockerfileEA

@@ -17,7 +17,8 @@ RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/auth_model.conf .
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea .
 
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
+#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
+COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/argocd-assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin

Wire.go

@@ -125,6 +125,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig"
 	chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
 	"github.com/devtron-labs/devtron/pkg/commonService"
+	"github.com/devtron-labs/devtron/pkg/configDiff"
 	delete2 "github.com/devtron-labs/devtron/pkg/delete"
 	deployment2 "github.com/devtron-labs/devtron/pkg/deployment"
 	"github.com/devtron-labs/devtron/pkg/deployment/common"
@@ -711,6 +712,13 @@ func InitializeApp() (*App, error) {
 		scopedVariable.NewScopedVariableRestHandlerImpl,
 		wire.Bind(new(scopedVariable.ScopedVariableRestHandler), new(*scopedVariable.ScopedVariableRestHandlerImpl)),
 
+		router.NewDeploymentConfigurationRouter,
+		wire.Bind(new(router.DeploymentConfigurationRouter), new(*router.DeploymentConfigurationRouterImpl)),
+		restHandler.NewDeploymentConfigurationRestHandlerImpl,
+		wire.Bind(new(restHandler.DeploymentConfigurationRestHandler), new(*restHandler.DeploymentConfigurationRestHandlerImpl)),
+		configDiff.NewDeploymentConfigurationServiceImpl,
+		wire.Bind(new(configDiff.DeploymentConfigurationService), new(*configDiff.DeploymentConfigurationServiceImpl)),
+
 		router.NewTelemetryRouterImpl,
 		wire.Bind(new(router.TelemetryRouter), new(*router.TelemetryRouterImpl)),
 		restHandler.NewTelemetryRestHandlerImpl,

api/appStore/InstalledAppRestHandler.go

@@ -148,6 +148,13 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppOverview(w http.ResponseWrit
 	token := r.Header.Get("token")
 	handler.Logger.Infow("request payload, FindAppOverview", "installedAppId", installedAppId)
 	installedApp, err := handler.installedAppService.GetInstalledAppById(installedAppId)
+	if err != nil && err != pg.ErrNoRows {
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	} else if err == pg.ErrNoRows || installedApp == nil {
+		common.WriteJsonResp(w, errors.New("helm app doses not exist"), nil, http.StatusNotFound)
+		return
+	}
 	appOverview, err := handler.appCrudOperationService.GetAppMetaInfo(installedApp.AppId, installedAppId, installedApp.EnvironmentId)
 	if err != nil {
 		handler.Logger.Errorw("service err, FetchAppOverview", "err", err, "appId", installedApp.AppId, "installedAppId", installedAppId)

api/argoApplication/ArgoApplicationRestHandler.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/read"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"go.uber.org/zap"
 	"net/http"
@@ -34,14 +35,16 @@ type ArgoApplicationRestHandler interface {
 
 type ArgoApplicationRestHandlerImpl struct {
 	argoApplicationService argoApplication.ArgoApplicationService
+	readService            read.ArgoApplicationReadService
 	logger                 *zap.SugaredLogger
 	enforcer               casbin.Enforcer
 }
 
 func NewArgoApplicationRestHandlerImpl(argoApplicationService argoApplication.ArgoApplicationService,
-	logger *zap.SugaredLogger, enforcer casbin.Enforcer) *ArgoApplicationRestHandlerImpl {
+	readService read.ArgoApplicationReadService, logger *zap.SugaredLogger, enforcer casbin.Enforcer) *ArgoApplicationRestHandlerImpl {
 	return &ArgoApplicationRestHandlerImpl{
 		argoApplicationService: argoApplicationService,
+		readService:            readService,
 		logger:                 logger,
 		enforcer:               enforcer,
 	}
@@ -101,9 +104,9 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
 			return
 		}
 	}
-	resp, err := handler.argoApplicationService.GetAppDetail(resourceName, namespace, clusterId)
+	resp, err := handler.readService.GetAppDetail(resourceName, namespace, clusterId)
 	if err != nil {
-		handler.logger.Errorw("error in listing all argo applications", "err", err, "resourceName", resourceName, "clusterId", clusterId)
+		handler.logger.Errorw("error in getting argo application app detail", "err", err, "resourceName", resourceName, "clusterId", clusterId)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}

api/argoApplication/wire_argoApplication.go

@@ -18,10 +18,14 @@ package argoApplication
 
 import (
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/read"
 	"github.com/google/wire"
 )
 
 var ArgoApplicationWireSet = wire.NewSet(
+	read.NewArgoApplicationReadServiceImpl,
+	wire.Bind(new(read.ArgoApplicationReadService), new(*read.ArgoApplicationReadServiceImpl)),
+
 	argoApplication.NewArgoApplicationServiceImpl,
 	wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceImpl)),