Skip to content

Commit 9255198

Browse files
ashoknayak777ashoknayak777
authored
Merge branch 'main' into argocd-list-doc
2 parents 03b770b + 18431d0 commit 9255198

File tree

1,345 files changed

+77293
-131080
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,345 files changed

+77293
-131080
lines changed

‎.gitbook.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ redirects:
1616
setup/upgrade/devtron-upgrade-0.2.x-0.3.x: getting-started/upgrade/devtron-upgrade-0.2.x-0.3.x
1717
setup/global-configurations: user-guide/global-configurations/README.md
1818
setup/global-configurations/gitops: user-guide/global-configurations/gitops.md
19-
setup/global-configurations/custom-charts: user-guide/global-configurations/custom-charts.md
19+
setup/global-configurations/custom-charts: user-guide/global-configurations/deployment-charts.md
2020
setup/global-configurations/user-access: user-guide/global-configurations/authorization/user-access.md
2121
setup/global-configurations/external-links: user-guide/global-configurations/external-links.md
2222
setup/global-configurations/projects: user-guide/global-configurations/projects.md
@@ -109,7 +109,7 @@ redirects:
109109
getting-started/global-configurations/filter-condition: user-guide/global-configurations/filter-condition.md
110110
getting-started/global-configurations/build-infra: user-guide/global-configurations/build-infra.md
111111
getting-started/global-configurations/gitops: user-guide/global-configurations/gitops.md
112-
getting-started/global-configurations/custom-charts: user-guide/global-configurations/custom-charts.md
112+
getting-started/global-configurations/custom-charts: user-guide/global-configurations/deployment-charts.md
113113
getting-started/global-configurations/external-links: user-guide/global-configurations/external-links.md
114114
getting-started/global-configurations/projects: user-guide/global-configurations/projects.md
115115
getting-started/global-configurations/manage-notification: user-guide/global-configurations/manage-notification.md
@@ -127,4 +127,5 @@ redirects:
127127
user-guide/clusters: user-guide/resource-browser.md
128128
usage/clusters: user-guide/resource-browser.md
129129
global-configurations/authorization/sso-login/okta: user-guide/global-configurations/authorization/sso/okta.md
130-
usage/applications/creating-application/ci-pipeline/ci-build-pre-post-plugins: user-guide/creating-application/workflow/ci-build-pre-post-plugins.md
130+
usage/applications/creating-application/ci-pipeline/ci-build-pre-post-plugins: user-guide/creating-application/workflow/ci-build-pre-post-plugins.md
131+
global-configurations/custom-charts: user-guide/global-configurations/deployment-charts.md

‎Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ RUN apt clean autoclean
1717
RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
1818
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/devtron .
1919
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/auth_model.conf .
20-
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
20+
#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
21+
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
2122
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
2223
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
2324
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin

‎DockerfileEA‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
1717
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/auth_model.conf .
1818
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea .
1919

20-
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
20+
#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
21+
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
2122
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
2223
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
2324
COPY --from=build-env /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin

‎Wire.go‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
"github.com/devtron-labs/devtron/api/deployment"
4242
"github.com/devtron-labs/devtron/api/devtronResource"
4343
"github.com/devtron-labs/devtron/api/externalLink"
44+
fluxApplication "github.com/devtron-labs/devtron/api/fluxApplication"
4445
client "github.com/devtron-labs/devtron/api/helm-app"
4546
"github.com/devtron-labs/devtron/api/infraConfig"
4647
"github.com/devtron-labs/devtron/api/k8s"
@@ -115,6 +116,7 @@ import (
115116
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/deploymentTypeChange"
116117
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/resource"
117118
"github.com/devtron-labs/devtron/pkg/appWorkflow"
119+
"github.com/devtron-labs/devtron/pkg/argoRepositoryCreds"
118120
"github.com/devtron-labs/devtron/pkg/asyncProvider"
119121
"github.com/devtron-labs/devtron/pkg/attributes"
120122
"github.com/devtron-labs/devtron/pkg/build"
@@ -123,6 +125,7 @@ import (
123125
"github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig"
124126
chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
125127
"github.com/devtron-labs/devtron/pkg/commonService"
128+
"github.com/devtron-labs/devtron/pkg/configDiff"
126129
delete2 "github.com/devtron-labs/devtron/pkg/delete"
127130
deployment2 "github.com/devtron-labs/devtron/pkg/deployment"
128131
"github.com/devtron-labs/devtron/pkg/deployment/common"
@@ -175,6 +178,7 @@ func InitializeApp() (*App, error) {
175178
externalLink.ExternalLinkWireSet,
176179
team.TeamsWireSet,
177180
AuthWireSet,
181+
util4.GetRuntimeConfig,
178182
util4.NewK8sUtil,
179183
wire.Bind(new(util4.K8sService), new(*util4.K8sServiceImpl)),
180184
user.UserWireSet,
@@ -198,7 +202,7 @@ func InitializeApp() (*App, error) {
198202
build.BuildWireSet,
199203
deployment2.DeploymentWireSet,
200204
argoApplication.ArgoApplicationWireSet,
201-
205+
fluxApplication.FluxApplicationWireSet,
202206
eventProcessor.EventProcessorWireSet,
203207
workflow3.WorkflowWireSet,
204208

@@ -708,6 +712,13 @@ func InitializeApp() (*App, error) {
708712
scopedVariable.NewScopedVariableRestHandlerImpl,
709713
wire.Bind(new(scopedVariable.ScopedVariableRestHandler), new(*scopedVariable.ScopedVariableRestHandlerImpl)),
710714

715+
router.NewDeploymentConfigurationRouter,
716+
wire.Bind(new(router.DeploymentConfigurationRouter), new(*router.DeploymentConfigurationRouterImpl)),
717+
restHandler.NewDeploymentConfigurationRestHandlerImpl,
718+
wire.Bind(new(restHandler.DeploymentConfigurationRestHandler), new(*restHandler.DeploymentConfigurationRestHandlerImpl)),
719+
configDiff.NewDeploymentConfigurationServiceImpl,
720+
wire.Bind(new(configDiff.DeploymentConfigurationService), new(*configDiff.DeploymentConfigurationServiceImpl)),
721+
711722
router.NewTelemetryRouterImpl,
712723
wire.Bind(new(router.TelemetryRouter), new(*router.TelemetryRouterImpl)),
713724
restHandler.NewTelemetryRestHandlerImpl,
@@ -989,6 +1000,9 @@ func InitializeApp() (*App, error) {
9891000
common.NewDeploymentConfigServiceImpl,
9901001
wire.Bind(new(common.DeploymentConfigService), new(*common.DeploymentConfigServiceImpl)),
9911002

1003+
argoRepositoryCreds.NewRepositorySecret,
1004+
wire.Bind(new(argoRepositoryCreds.RepositorySecret), new(*argoRepositoryCreds.RepositorySecretImpl)),
1005+
9921006
repocreds.NewServiceClientImpl,
9931007
wire.Bind(new(repocreds.ServiceClient), new(*repocreds.ServiceClientImpl)),
9941008
)

‎api/argoApplication/ArgoApplicationRestHandler.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"errors"
2121
"github.com/devtron-labs/devtron/api/restHandler/common"
2222
"github.com/devtron-labs/devtron/pkg/argoApplication"
23+
"github.com/devtron-labs/devtron/pkg/argoApplication/read"
2324
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
2425
"go.uber.org/zap"
2526
"net/http"
@@ -34,14 +35,16 @@ type ArgoApplicationRestHandler interface {
3435

3536
type ArgoApplicationRestHandlerImpl struct {
3637
argoApplicationService argoApplication.ArgoApplicationService
38+
readService read.ArgoApplicationReadService
3739
logger *zap.SugaredLogger
3840
enforcer casbin.Enforcer
3941
}
4042

4143
func NewArgoApplicationRestHandlerImpl(argoApplicationService argoApplication.ArgoApplicationService,
42-
logger *zap.SugaredLogger, enforcer casbin.Enforcer) *ArgoApplicationRestHandlerImpl {
44+
readService read.ArgoApplicationReadService, logger *zap.SugaredLogger, enforcer casbin.Enforcer) *ArgoApplicationRestHandlerImpl {
4345
return &ArgoApplicationRestHandlerImpl{
4446
argoApplicationService: argoApplicationService,
47+
readService: readService,
4548
logger: logger,
4649
enforcer: enforcer,
4750
}
@@ -101,9 +104,9 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
101104
return
102105
}
103106
}
104-
resp, err := handler.argoApplicationService.GetAppDetail(resourceName, namespace, clusterId)
107+
resp, err := handler.readService.GetAppDetail(resourceName, namespace, clusterId)
105108
if err != nil {
106-
handler.logger.Errorw("error in listing all argo applications", "err", err, "resourceName", resourceName, "clusterId", clusterId)
109+
handler.logger.Errorw("error in getting argo application app detail", "err", err, "resourceName", resourceName, "clusterId", clusterId)
107110
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
108111
return
109112
}

‎api/argoApplication/wire_argoApplication.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@ package argoApplication
1818

1919
import (
2020
"github.com/devtron-labs/devtron/pkg/argoApplication"
21+
"github.com/devtron-labs/devtron/pkg/argoApplication/read"
2122
"github.com/google/wire"
2223
)
2324

2425
var ArgoApplicationWireSet = wire.NewSet(
26+
read.NewArgoApplicationReadServiceImpl,
27+
wire.Bind(new(read.ArgoApplicationReadService), new(*read.ArgoApplicationReadServiceImpl)),
28+
2529
argoApplication.NewArgoApplicationServiceImpl,
2630
wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceImpl)),
2731

0 commit comments

Comments
 (0)