feat: Ns labels refactoring

.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

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/deployment/CommonDeploymentRestHandler.go

@@ -171,7 +171,7 @@ func (handler *CommonDeploymentRestHandlerImpl) GetDeploymentHistory(w http.Resp
 	}
 	//rbac block ends here
 
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second)
 	defer cancel()
 	res, err := handler.appStoreDeploymentService.GetDeploymentHistory(ctx, installedAppDto)
 	if err != nil {

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)),